From: Roopesh Chander Date: Fri, 7 Dec 2018 06:19:10 +0000 (+0530) Subject: Tunnels list: Deselect rows correctly X-Git-Tag: 0.0.20181104-5~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05d0429c501185c53830d00f04a70a59eba93b81;p=thirdparty%2Fwireguard-apple.git Tunnels list: Deselect rows correctly Do it like UITableViewController.clearsSelectionOnViewWillAppear would. Signed-off-by: Roopesh Chander --- diff --git a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift index 4cff27c..f558de4 100644 --- a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift @@ -91,6 +91,13 @@ class TunnelsListTableViewController: UIViewController { tunnelsManager.tunnelsListDelegate = self } + override func viewWillAppear(_: Bool) { + // Remove selection when getting back to the list view on iPhone + if let tableView = self.tableView, let selectedRowIndexPath = tableView.indexPathForSelectedRow { + tableView.deselectRow(at: selectedRowIndexPath, animated: false) + } + } + @objc func addButtonTapped(sender: AnyObject) { if (self.tunnelsManager == nil) { return } // Do nothing until we've loaded the tunnels let alert = UIAlertController(title: "", message: "Add a new WireGuard tunnel", preferredStyle: .actionSheet) @@ -254,7 +261,6 @@ extension TunnelsListTableViewController: UITableViewDataSource { extension TunnelsListTableViewController: UITableViewDelegate { func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - tableView.deselectRow(at: indexPath, animated: true) guard let tunnelsManager = tunnelsManager else { return } let tunnel = tunnelsManager.tunnel(at: indexPath.row) let tunnelDetailVC = TunnelDetailTableViewController(tunnelsManager: tunnelsManager,