From 5e9780ef8fcb5fe7da7d30fc4c8df276547fc8dd Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Mon, 27 May 2019 15:36:34 +0530 Subject: iOS: Should be able to re-show tunnel detail Fixes a bug introduced in the refactoring in commit 7322fb084087774e8b58e347902f6d7036cbde5c Signed-off-by: Roopesh Chander --- .../TunnelsListTableViewController.swift | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'WireGuard/WireGuard') diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift index 43f58df..372a8e3 100644 --- a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift @@ -257,18 +257,16 @@ class TunnelsListTableViewController: UIViewController { guard let splitViewController = splitViewController else { return } guard let navController = navigationController else { return } - if detailDisplayedTunnel != tunnel { - let tunnelDetailVC = TunnelDetailTableViewController(tunnelsManager: tunnelsManager, - tunnel: tunnel) - let tunnelDetailNC = UINavigationController(rootViewController: tunnelDetailVC) - tunnelDetailNC.restorationIdentifier = "DetailNC" - if splitViewController.isCollapsed && navController.viewControllers.count > 1 { - navController.setViewControllers([self, tunnelDetailNC], animated: animated) - } else { - splitViewController.showDetailViewController(tunnelDetailNC, sender: self, animated: animated) - } - detailDisplayedTunnel = tunnel + let tunnelDetailVC = TunnelDetailTableViewController(tunnelsManager: tunnelsManager, + tunnel: tunnel) + let tunnelDetailNC = UINavigationController(rootViewController: tunnelDetailVC) + tunnelDetailNC.restorationIdentifier = "DetailNC" + if splitViewController.isCollapsed && navController.viewControllers.count > 1 { + navController.setViewControllers([self, tunnelDetailNC], animated: animated) + } else { + splitViewController.showDetailViewController(tunnelDetailNC, sender: self, animated: animated) } + detailDisplayedTunnel = tunnel self.presentedViewController?.dismiss(animated: false, completion: nil) } } -- cgit v1.2.3-59-g8ed1b