passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Roopesh Chander 2018-11-08 15:08:57 +05:30
parent 7c9d45ac97
commit 3f3f22a048
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift
View File

@ -33,8 +33,6 @@ class ErrorPresenter {
case .restarting: case .restarting:
return "active" return "active"
case .activating: fallthrough case .activating: fallthrough
case .resolvingEndpointDomains:
return "being activated"
case .deactivating: case .deactivating:
return "being deactivated" return "being deactivated"
case .inactive: case .inactive:

2
WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
View File

@ -259,8 +259,6 @@ class TunnelDetailTableViewStatusCell: UITableViewCell {
text = "Deactivating" text = "Deactivating"
case .reasserting: case .reasserting:
text = "Reactivating" text = "Reactivating"
case .resolvingEndpointDomains:
text = "Resolving domains"
case .restarting: case .restarting:
text = "Restarting" text = "Restarting"
} }

5
WireGuard/WireGuard/VPN/TunnelsManager.swift
View File

@ -372,10 +372,6 @@ class TunnelContainer: NSObject {
} }
return 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) s.status = TunnelStatus(from: connection.status)
if (s.status == .inactive) { if (s.status == .inactive) {
s.statusObservationToken = nil s.statusObservationToken = nil
@ -392,7 +388,6 @@ class TunnelContainer: NSObject {
case reasserting // Not a possible state at present case reasserting // Not a possible state at present
case restarting // Restarting tunnel (done after saving modifications to an active tunnel) case restarting // Restarting tunnel (done after saving modifications to an active tunnel)
case resolvingEndpointDomains // DNS resolution in progress
init(from vpnStatus: NEVPNStatus) { init(from vpnStatus: NEVPNStatus) {
switch (vpnStatus) { switch (vpnStatus) {