From: Roopesh Chander <roop@roopc.net>
Date: Fri, 21 Dec 2018 12:32:18 +0000 (+0530)
Subject: Tunnel detail: iPad: Handle deletion of tunnel correctly
X-Git-Tag: 0.0.20181225-1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e47a8232d89608e98a474317fa5266295c5808cd;p=thirdparty%2Fwireguard-apple.git

Tunnel detail: iPad: Handle deletion of tunnel correctly

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

diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift
index 6fb54fc..d3f9c84 100644
--- a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift
@@ -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