diff options
| author |   Roopesh Chander <roop@roopc.net> | 2018-11-08 15:08:57 +0530 |
|---|---|---|
| committer | Roopesh Chander <roop@roopc.net> | 2018-11-08 15:08:57 +0530 |
| commit | 62573e2ad717fd6317566520d2dc5d88324ffdf7 (patch) | |
| tree | 200a0016818f9d5b44ca263be6067bb180b5f617 /WireGuard | |
| parent | Move logic to extension: DNS resolution no longer happens in the app (diff) | |
| download | wireguard-apple-62573e2ad717fd6317566520d2dc5d88324ffdf7.tar.xz wireguard-apple-62573e2ad717fd6317566520d2dc5d88324ffdf7.zip | |
Move logic to extension: .resolvingEndpointDomains is not longer a valid status
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to 'WireGuard')
| -rw-r--r-- | WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift | 2 | ||||
| -rw-r--r-- | WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift | 2 | ||||
| -rw-r--r-- | WireGuard/WireGuard/VPN/TunnelsManager.swift | 5 |
3 files changed, 0 insertions, 9 deletions
diff --git a/WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift b/WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift index d9a66dd..cbb5b8b 100644 --- a/WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift +++ b/WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift @@ -33,8 +33,6 @@ class ErrorPresenter { case .restarting: return "active" case .activating: fallthrough - case .resolvingEndpointDomains: - return "being activated" case .deactivating: return "being deactivated" case .inactive: diff --git a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift index 3e30662..76a38e3 100644 --- a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift @@ -259,8 +259,6 @@ class TunnelDetailTableViewStatusCell: UITableViewCell { text = "Deactivating" case .reasserting: text = "Reactivating" - case .resolvingEndpointDomains: - text = "Resolving domains" case .restarting: text = "Restarting" } diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift index c413e1d..be6c860 100644 --- a/WireGuard/WireGuard/VPN/TunnelsManager.swift +++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift @@ -372,10 +372,6 @@ class TunnelContainer: NSObject { } return } - if (s.status == .resolvingEndpointDomains && connection.status == .disconnected) { - // Don't change to .inactive if we're still resolving endpoints - return - } s.status = TunnelStatus(from: connection.status) if (s.status == .inactive) { s.statusObservationToken = nil @@ -392,7 +388,6 @@ class TunnelContainer: NSObject { case reasserting // Not a possible state at present case restarting // Restarting tunnel (done after saving modifications to an active tunnel) - case resolvingEndpointDomains // DNS resolution in progress init(from vpnStatus: NEVPNStatus) { switch (vpnStatus) { |