aboutsummaryrefslogtreecommitdiffstats
path: root/WireGuard/WireGuard/VPN/TunnelsManager.swift
diff options
context:
space:
mode:
authorRoopesh Chander <roop@roopc.net>2018-12-06 16:13:48 +0530
committerRoopesh Chander <roop@roopc.net>2018-12-07 12:36:19 +0530
commitc9267ba634f5699318502035c03fa281361cc581 (patch)
tree65cb7106e0fcd3915efd5a2a1135da1b0a05fda3 /WireGuard/WireGuard/VPN/TunnelsManager.swift
parentError handling: Cleanup Tunnels Manager errors (diff)
downloadwireguard-apple-c9267ba634f5699318502035c03fa281361cc581.tar.xz
wireguard-apple-c9267ba634f5699318502035c03fa281361cc581.zip
Error handling: Introduce a WireGuardAppError protocol to manage errors
The alert strings shall be located next to where the errors are declared. Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to '')
-rw-r--r--WireGuard/WireGuard/VPN/TunnelsManager.swift28
1 files changed, 27 insertions, 1 deletions
diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index 77eb8e5..03d1a45 100644
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -16,7 +16,8 @@ protocol TunnelsManagerActivationDelegate: class {
func tunnelActivationFailed(tunnel: TunnelContainer, error: TunnelsManagerError)
}
-enum TunnelsManagerError: Error {
+enum TunnelsManagerError: WireGuardAppError {
+ // Tunnels list management
case tunnelNameEmpty
case tunnelAlreadyExistsWithThatName
case vpnSystemErrorOnListingTunnels
@@ -24,9 +25,34 @@ enum TunnelsManagerError: Error {
case vpnSystemErrorOnModifyTunnel
case vpnSystemErrorOnRemoveTunnel
+ // Tunnel activation
case tunnelActivationAttemptFailed // startTunnel() throwed
case tunnelActivationFailedInternalError // startTunnel() succeeded, but activation failed
case tunnelActivationFailedNoInternetConnection // startTunnel() succeeded, but activation failed since no internet
+
+ func alertText() -> (String, String) {
+ switch (self) {
+ case .tunnelNameEmpty:
+ return ("No name provided", "Can't create tunnel with an empty name")
+ case .tunnelAlreadyExistsWithThatName:
+ return ("Name already exists", "A tunnel with that name already exists")
+ case .vpnSystemErrorOnListingTunnels:
+ return ("Unable to list tunnels", "Internal error")
+ case .vpnSystemErrorOnAddTunnel:
+ return ("Unable to create tunnel", "Internal error")
+ case .vpnSystemErrorOnModifyTunnel:
+ return ("Unable to modify tunnel", "Internal error")
+ case .vpnSystemErrorOnRemoveTunnel:
+ return ("Unable to remove tunnel", "Internal error")
+
+ case .tunnelActivationAttemptFailed:
+ return ("Activation failure", "The tunnel could not be activated due to an internal error")
+ case .tunnelActivationFailedInternalError:
+ return ("Activation failure", "The tunnel could not be activated due to an internal error")
+ case .tunnelActivationFailedNoInternetConnection:
+ return ("Activation failure", "No internet connection")
+ }
+ }
}
enum TunnelsManagerResult<T> {