TunnelsManager: startDeactivation() need not take a completion handler

Because the completion handler pattern doesn't fit in this case.

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

diff --git a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
index 76a38e348123da808834e91648cbe2182ae2d73f..5209b3ac383a1e2767f2a984af1ef740959bc380 100644 (file)
--- a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
@@ -159,9 +159,7 @@ extension TunnelDetailTableViewController {
                         }
                     }
                 } else {
-                    s.tunnelsManager.startDeactivation(of: s.tunnel) { error in
-                        print("Error while deactivating: \(String(describing: error))")
-                    }
+                    s.tunnelsManager.startDeactivation(of: s.tunnel)
                 }
             }
             return cell

diff --git a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
index a9d858e97d4eecec6bd35a75cfa879e9fa2a1644..ba6174326e14c9c7b94fba81754dd5721fd2ca21 100644 (file)
--- a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
@@ -287,9 +287,7 @@ extension TunnelsListTableViewController: UITableViewDataSource {
                         }
                     }
                 } else {
-                    tunnelsManager.startDeactivation(of: tunnel) { [weak s] error in
-                        s?.showErrorAlert(title: "Deactivation error", message: "Error while bringing down tunnel: \(String(describing: error))")
-                    }
+                    tunnelsManager.startDeactivation(of: tunnel)
                 }
             }
         }

diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index a5e94a851069192c8a6a93fe5da4bb197f00b1e9..d07f439a711ca824fdbe2a172415c352414410d9 100644 (file)
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -200,9 +200,8 @@ class TunnelsManager {
         tunnel.startActivation(completionHandler: completionHandler)
     }
 
-    func startDeactivation(of tunnel: TunnelContainer, completionHandler: @escaping (Error?) -> Void) {
+    func startDeactivation(of tunnel: TunnelContainer) {
         if (tunnel.status == .inactive) {
-            completionHandler(TunnelActivationError.attemptingDeactivationWhenTunnelIsInactive)
             return
         }
         tunnel.startDeactivation()