diff options
| author |   Roopesh Chander <roop@roopc.net> | 2018-12-11 03:24:28 +0530 |
|---|---|---|
| committer | Roopesh Chander <roop@roopc.net> | 2018-12-11 03:47:23 +0530 |
| commit | 1fd0c56f08e5b3a193005e50a226384f9321dbb1 (patch) | |
| tree | 2b4e5e0654d66936ff1b8b52926a2bcba6991597 /WireGuard/WireGuard/UI/iOS | |
| parent | TunnelsManager: Deactivate only when the status becomes 'connected' (diff) | |
| download | wireguard-apple-1fd0c56f08e5b3a193005e50a226384f9321dbb1.tar.xz wireguard-apple-1fd0c56f08e5b3a193005e50a226384f9321dbb1.zip | |
Remove the feature of waiting for another tunnel to deactivate
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to 'WireGuard/WireGuard/UI/iOS')
| -rw-r--r-- | WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift | 4 | ||||
| -rw-r--r-- | WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift index fffaeb9..be81f7f 100644 --- a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift @@ -269,14 +269,12 @@ class TunnelDetailTableViewStatusCell: UITableViewCell { text = "Reactivating" case .restarting: text = "Restarting" - case .waiting: - text = "Waiting" } textLabel?.text = text DispatchQueue.main.async { [weak statusSwitch] in guard let statusSwitch = statusSwitch else { return } statusSwitch.isOn = !(status == .deactivating || status == .inactive) - statusSwitch.isUserInteractionEnabled = (status == .inactive || status == .active || status == .waiting) + statusSwitch.isUserInteractionEnabled = (status == .inactive || status == .active) } textLabel?.textColor = (status == .active || status == .inactive) ? UIColor.black : UIColor.gray } diff --git a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift index 7c76aa6..b1102c4 100644 --- a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift @@ -390,7 +390,7 @@ class TunnelsListTableViewCell: UITableViewCell { DispatchQueue.main.async { [weak statusSwitch, weak busyIndicator] in guard let statusSwitch = statusSwitch, let busyIndicator = busyIndicator else { return } statusSwitch.isOn = !(status == .deactivating || status == .inactive) - statusSwitch.isUserInteractionEnabled = (status == .inactive || status == .active || status == .waiting) + statusSwitch.isUserInteractionEnabled = (status == .inactive || status == .active) if (status == .inactive || status == .active) { busyIndicator.stopAnimating() } else { |