]> git.ipfire.org Git - thirdparty/wireguard-apple.git/commitdiff
macOS: Tunnel detail: No need to update runtime info on tunnelSaved()
authorRoopesh Chander <roop@roopc.net>
Mon, 27 May 2019 09:11:56 +0000 (14:41 +0530)
committerRoopesh Chander <roop@roopc.net>
Mon, 27 May 2019 09:13:41 +0000 (14:43 +0530)
Signed-off-by: Roopesh Chander <roop@roopc.net>
WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift

index 5158b37c9756816ac1b214215492e74ae29f9310..eafa88f78639d6e17368e3285e10a312e2a0aad5 100644 (file)
@@ -102,7 +102,13 @@ class TunnelDetailTableViewController: NSViewController {
         updateTableViewModelRowsBySection()
         updateTableViewModelRows()
         statusObservationToken = tunnel.observe(\TunnelContainer.status) { [weak self] _, _ in
-            self?.updateStatus()
+            guard let self = self else { return }
+            if tunnel.status == .active {
+                self.startUpdatingRuntimeConfiguration()
+            } else if tunnel.status == .inactive {
+                self.reloadRuntimeConfiguration()
+                self.stopUpdatingRuntimeConfiguration()
+            }
         }
     }
 
@@ -199,15 +205,6 @@ class TunnelDetailTableViewController: NSViewController {
         tableViewModelRows = tableViewModelRowsBySection.flatMap { $0.filter { $0.isVisible }.map { $0.modelRow } }
     }
 
-    func updateStatus() {
-        if tunnel.status == .active {
-            startUpdatingRuntimeConfiguration()
-        } else if tunnel.status == .inactive {
-            reloadRuntimeConfiguration()
-            stopUpdatingRuntimeConfiguration()
-        }
-    }
-
     @objc func handleEditTunnelAction() {
         PrivateDataConfirmation.confirmAccess(to: tr("macViewPrivateData")) { [weak self] in
             guard let self = self else { return }
@@ -508,7 +505,6 @@ extension TunnelDetailTableViewController: TunnelEditViewControllerDelegate {
         onDemandViewModel = ActivateOnDemandViewModel(tunnel: tunnel)
         updateTableViewModelRowsBySection()
         updateTableViewModelRows()
-        updateStatus()
         tableView.reloadData()
         self.tunnelEditVC = nil
     }