Accessibility: implement magic tap

2 files changed, 27 insertions, 3 deletions

diff --git a/ios/MullvadVPN/AppDelegate.swift b/ios/MullvadVPN/AppDelegate.swift
index 0591fa0d79..9bc80732fa 100644
--- a/ios/MullvadVPN/AppDelegate.swift
+++ b/ios/MullvadVPN/AppDelegate.swift
@@ -382,6 +382,18 @@ extension AppDelegate: RootContainerViewControllerDelegate {
             return controller.supportedInterfaceOrientations
         }
     }
+
+    func rootContainerViewAccessibilityPerformMagicTap(_ controller: RootContainerViewController) -> Bool {
+        guard Account.shared.isLoggedIn else { return false }
+
+        switch TunnelManager.shared.tunnelState {
+        case .connected, .connecting, .reconnecting:
+            reconnectTunnel()
+        case .disconnecting, .disconnected:
+            connectTunnel()
+        }
+        return true
+    }
 }
 
 // MARK: - LoginViewControllerDelegate
@@ -517,9 +529,7 @@ extension AppDelegate: ConnectViewControllerDelegate {
     }
 
     func connectViewControllerShouldReconnectTunnel(_ controller: ConnectViewController) {
-        TunnelManager.shared.reconnectTunnel {
-            self.logger?.debug("Re-connected VPN tunnel")
-        }
+        reconnectTunnel()
     }
 
     @objc private func handleDismissSelectLocationController(_ sender: Any) {
@@ -554,6 +564,12 @@ extension AppDelegate: ConnectViewControllerDelegate {
         }
     }
 
+    private func reconnectTunnel() {
+        TunnelManager.shared.reconnectTunnel {
+            self.logger?.debug("Re-connected VPN tunnel")
+        }
+    }
+
     private func presentTunnelError(_ error: TunnelManager.Error, alertTitle: String) {
         let alertController = UIAlertController(
             title: alertTitle,
diff --git a/ios/MullvadVPN/RootContainerViewController.swift b/ios/MullvadVPN/RootContainerViewController.swift
index 5ba68f75cf..7aaadddc56 100644
--- a/ios/MullvadVPN/RootContainerViewController.swift
+++ b/ios/MullvadVPN/RootContainerViewController.swift
@@ -49,6 +49,8 @@ protocol RootContainerViewControllerDelegate: AnyObject {
     func rootContainerViewControllerShouldShowSettings(_ controller: RootContainerViewController, navigateTo route: SettingsNavigationRoute?, animated: Bool)
 
     func rootContainerViewSupportedInterfaceOrientations(_ controller: RootContainerViewController) -> UIInterfaceOrientationMask
+
+    func rootContainerViewAccessibilityPerformMagicTap(_ controller: RootContainerViewController) -> Bool
 }
 
 /// A root container view controller
@@ -271,6 +273,12 @@ class RootContainerViewController: UIViewController {
         }
     }
 
+    // MARK: - Accessibility
+
+    override func accessibilityPerformMagicTap() -> Bool {
+        return delegate?.rootContainerViewAccessibilityPerformMagicTap(self) ?? super.accessibilityPerformMagicTap()
+    }
+
     // MARK: - Private
 
     private func addTransitionView() {