]> git.ipfire.org Git - thirdparty/wireguard-apple.git/commitdiff
macOS: Simplify reusing of the detail VC when applicable
authorRoopesh Chander <roop@roopc.net>
Thu, 4 Apr 2019 06:54:25 +0000 (12:24 +0530)
committerRoopesh Chander <roop@roopc.net>
Thu, 4 Apr 2019 06:54:32 +0000 (12:24 +0530)
Signed-off-by: Roopesh Chander <roop@roopc.net>
WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift

index de41963e2a0abaff59a083bc4d2e496534f2eed9..b3888431890e2c2166348db9ef057293f3701337 100644 (file)
@@ -86,12 +86,7 @@ extension ManageTunnelsRootViewController: TunnelsListTableViewControllerDelegat
                 setTunnelDetailContentVC(tunnelDetailVC)
                 self.tunnelDetailVC = tunnelDetailVC
             } else {
-                let unusableTunnelDetailVC: UnusableTunnelDetailViewController
-                if let unusableTunnelContentVC = tunnelDetailContentVC as? UnusableTunnelDetailViewController {
-                    unusableTunnelDetailVC = unusableTunnelContentVC
-                } else {
-                    unusableTunnelDetailVC = UnusableTunnelDetailViewController()
-                }
+                let unusableTunnelDetailVC = tunnelDetailContentVC as? UnusableTunnelDetailViewController ?? UnusableTunnelDetailViewController()
                 unusableTunnelDetailVC.onButtonClicked = { [weak tunnelsListVC] in
                     tunnelsListVC?.handleRemoveTunnelAction()
                 }
@@ -99,12 +94,7 @@ extension ManageTunnelsRootViewController: TunnelsListTableViewControllerDelegat
                 self.tunnelDetailVC = nil
             }
         } else if tunnelIndices.count > 1 {
-            let multiSelectionVC: ButtonedDetailViewController
-            if let buttonedDetailVC = tunnelDetailContentVC as? ButtonedDetailViewController {
-                multiSelectionVC = buttonedDetailVC
-            } else {
-                multiSelectionVC = ButtonedDetailViewController()
-            }
+            let multiSelectionVC = tunnelDetailContentVC as? ButtonedDetailViewController ?? ButtonedDetailViewController()
             multiSelectionVC.setButtonTitle(tr(format: "macButtonDeleteTunnels (%d)", tunnelIndices.count))
             multiSelectionVC.onButtonClicked = { [weak tunnelsListVC] in
                 tunnelsListVC?.handleRemoveTunnelAction()