Tunnel editing: Delegate should also report when editing is cancelled

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

diff --git a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
index 1ca6ec6fbc1247d15648d3db1bf85e3656d92b1a..b4ae135f52a774c3fd909b77c9304191f7d4d55e 100644 (file)
--- a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
@@ -54,10 +54,13 @@ class TunnelDetailTableViewController: UITableViewController {
 // MARK: TunnelEditTableViewControllerDelegate
 
 extension TunnelDetailTableViewController: TunnelEditTableViewControllerDelegate {
-    func saved(tunnel: TunnelContainer) {
+    func tunnelSaved(tunnel: TunnelContainer) {
         tunnelViewModel = TunnelViewModel(tunnelConfiguration: tunnel.tunnelConfiguration)
         self.tableView.reloadData()
     }
+    func tunnelEditingCancelled() {
+        // Nothing to do
+    }
 }
 
 // MARK: UITableViewDataSource

diff --git a/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
index 1c863f5c7f02461b971764cd904a3fbd2855aa2c..1054cfaf68a9422c23494df4443d0b489a7b0619 100644 (file)
--- a/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
@@ -4,7 +4,8 @@
 import UIKit
 
 protocol TunnelEditTableViewControllerDelegate: class {
-    func saved(tunnel: TunnelContainer)
+    func tunnelSaved(tunnel: TunnelContainer)
+    func tunnelEditingCancelled()
 }
 
 // MARK: TunnelEditTableViewController
@@ -81,8 +82,8 @@ class TunnelEditTableViewController: UITableViewController {
                         print("Could not modify tunnel: \(error)")
                         self?.showErrorAlert(title: "Could not save", message: "Internal error")
                     } else {
-                        self?.delegate?.saved(tunnel: tunnel)
                         self?.dismiss(animated: true, completion: nil)
+                        self?.delegate?.tunnelSaved(tunnel: tunnel)
                     }
                 }
             } else {
@@ -92,8 +93,8 @@ class TunnelEditTableViewController: UITableViewController {
                         print("Could not add tunnel: \(error)")
                         self?.showErrorAlert(title: "Could not save", message: "Internal error")
                     } else {
-                        self?.delegate?.saved(tunnel: tunnel)
                         self?.dismiss(animated: true, completion: nil)
+                        self?.delegate?.tunnelSaved(tunnel: tunnel)
                     }
                 }
             }
@@ -102,6 +103,7 @@ class TunnelEditTableViewController: UITableViewController {
 
     @objc func cancelTapped() {
         dismiss(animated: true, completion: nil)
+        self.delegate?.tunnelEditingCancelled()
     }
 
     func showErrorAlert(title: String, message: String) {

diff --git a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
index 0500f183abc9bed0ea7f6f0d10341e56d049f93e..e88ec9117e8398a03e6d8d8825f8c8c281560699 100644 (file)
--- a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
@@ -94,12 +94,15 @@ class TunnelsListTableViewController: UITableViewController {
 // MARK: TunnelEditTableViewControllerDelegate
 
 extension TunnelsListTableViewController: TunnelEditTableViewControllerDelegate {
-    func saved(tunnel: TunnelContainer) {
+    func tunnelSaved(tunnel: TunnelContainer) {
         guard let tunnelsManager = tunnelsManager else { return }
         let tunnelDetailVC = TunnelDetailTableViewController(tunnelsManager: tunnelsManager,
                                                              tunnel: tunnel)
         showDetailViewController(tunnelDetailVC, sender: self) // Shall get propagated up to the split-vc
     }
+    func tunnelEditingCancelled() {
+        // Nothing to do here
+    }
 }
 
 // MARK: UITableViewDataSource