aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoopesh Chander <roop@roopc.net>2018-12-11 01:36:15 +0530
committerRoopesh Chander <roop@roopc.net>2018-12-11 02:01:54 +0530
commit4d63a3e9bdf4e01b934b4a0077d0f6b0c74b76b9 (patch)
treeea42d248eee9ea12051fe5a17baf861067fa7519
parentTunnelsManager: Handle status change in TunnelsManager (diff)
downloadwireguard-apple-4d63a3e9bdf4e01b934b4a0077d0f6b0c74b76b9.tar.xz
wireguard-apple-4d63a3e9bdf4e01b934b4a0077d0f6b0c74b76b9.zip
Allow turning off the status switch of a waiting tunnel
It just means the waiting should be cancelled Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to '')
-rw-r--r--WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift2
-rw-r--r--WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift2
2 files changed, 2 insertions, 2 deletions
diff --git a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
index 5c6cf15..fffaeb9 100644
--- a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
@@ -276,7 +276,7 @@ class TunnelDetailTableViewStatusCell: UITableViewCell {
DispatchQueue.main.async { [weak statusSwitch] in
guard let statusSwitch = statusSwitch else { return }
statusSwitch.isOn = !(status == .deactivating || status == .inactive)
- statusSwitch.isUserInteractionEnabled = (status == .inactive || status == .active)
+ statusSwitch.isUserInteractionEnabled = (status == .inactive || status == .active || status == .waiting)
}
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 b1102c4..7c76aa6 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)
+ statusSwitch.isUserInteractionEnabled = (status == .inactive || status == .active || status == .waiting)
if (status == .inactive || status == .active) {
busyIndicator.stopAnimating()
} else {