]> git.ipfire.org Git - thirdparty/wireguard-apple.git/commitdiff
Tunnel detail: iPad: Handle deletion of tunnel correctly
authorRoopesh Chander <roop@roopc.net>
Fri, 21 Dec 2018 12:32:18 +0000 (18:02 +0530)
committerRoopesh Chander <roop@roopc.net>
Fri, 21 Dec 2018 12:32:18 +0000 (18:02 +0530)
Signed-off-by: Roopesh Chander <roop@roopc.net>
WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift

index 6fb54fce614eadc4dd353ff661200124ddec3d3b..d3f9c8433e33f5c2195582a2b0db0724eab91292 100644 (file)
@@ -243,14 +243,21 @@ extension TunnelDetailTableViewController {
         cell.onTapped = { [weak self] in
             guard let self = self else { return }
             self.showConfirmationAlert(message: "Delete this tunnel?", buttonTitle: "Delete", from: cell) { [weak self] in
-                guard let tunnelsManager = self?.tunnelsManager, let tunnel = self?.tunnel else { return }
-                tunnelsManager.remove(tunnel: tunnel) { error in
+                guard let self = self else { return }
+                self.tunnelsManager.remove(tunnel: self.tunnel) { error in
                     if error != nil {
                         print("Error removing tunnel: \(String(describing: error))")
                         return
                     }
                 }
-                self?.navigationController?.navigationController?.popToRootViewController(animated: true)
+                if self.splitViewController?.isCollapsed ?? true {
+                    self.navigationController?.navigationController?.popToRootViewController(animated: true)
+                } else {
+                    let detailVC = UIViewController()
+                    detailVC.view.backgroundColor = .white
+                    let detailNC = UINavigationController(rootViewController: detailVC)
+                    self.showDetailViewController(detailNC, sender: self)
+                }
             }
         }
         return cell