Move logic to extension: .resolvingEndpointDomains is not longer a valid status

Signed-off-by: Roopesh Chander <roop@roopc.net>

diff --git a/WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift b/WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift
index d9a66dd2e2e631e02f12c818f3e66230822a14e5..cbb5b8b4aa311baf6532888c37419057b7420e68 100644 (file)
--- 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 3e30662e19d53788b37755bbd46ff38bed48d8c2..76a38e348123da808834e91648cbe2182ae2d73f 100644 (file)
--- 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 c413e1dff8982ff62b125df734e1745d591f54b3..be6c8603f425cb7a17c1430f5e2380a1bb600a8b 100644 (file)
--- 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) {