Refactor alerts to be presented on their respective coordinator

mullvad · Sep 1, 2023 · 2a26e42 · 2a26e42
1 parent 26a812b
commit 2a26e42
Show file tree

Hide file tree

Showing 18 changed files with 122 additions and 46 deletions.
diff --git a/ios/.swiftlint.yml b/ios/.swiftlint.yml
@@ -31,6 +31,8 @@ line_length:
   ignores_interpolated_strings: true
   warning: 120
   error: 300
+cyclomatic_complexity:
+  ignores_case_statements: true
 
 type_name:
   min_length: 4

diff --git a/ios/MullvadVPN/Classes/AppRoutes.swift b/ios/MullvadVPN/Classes/AppRoutes.swift
@@ -94,7 +94,7 @@ enum AppRoute: AppRouteProtocol {
     /**
      Alert route.
      */
-    case alert(AlertPresentation)
+    case alert(AlertPresentation, Coordinator)
 
     /**
      Routes that are part of primary horizontal navigation group.

diff --git a/ios/MullvadVPN/Coordinators/AccountCoordinator.swift b/ios/MullvadVPN/Coordinators/AccountCoordinator.swift
@@ -48,7 +48,7 @@ final class AccountCoordinator: Coordinator, Presentable, Presenting {
 
         let accountController = AccountViewController(
             interactor: interactor,
-            errorPresenter: PaymentAlertPresenter(coordinator: self)
+            errorPresenter: PaymentAlertPresenter(alertContext: self)
         )
 
         accountController.actionHandler = handleViewControllerAction
@@ -133,18 +133,25 @@ final class AccountCoordinator: Coordinator, Presentable, Presenting {
     // MARK: - Alerts
 
     private func logOut() {
-        let presentation = AlertPresentation(icon: .spinner, message: nil, buttons: [])
+        let presentation = AlertPresentation(
+            id: "account-logout-alert",
+            icon: .spinner,
+            message: nil,
+            buttons: []
+        )
+
+        let alertPresenter = AlertPresenter(context: self)
 
         interactor.logout {
             DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(1)) { [weak self] in
                 guard let self else { return }
 
-                applicationRouter?.dismiss(.alert(presentation), animated: true)
+                alertPresenter.dismissAlert(presentation: presentation, animated: true)
                 self.didFinish?(self, .userLoggedOut)
             }
         }
 
-        applicationRouter?.present(.alert(presentation))
+        alertPresenter.showAlert(presentation: presentation, animated: true)
     }
 
     private func showAccountDeviceInfo() {
@@ -164,6 +171,7 @@ final class AccountCoordinator: Coordinator, Presentable, Presenting {
         )
 
         let presentation = AlertPresentation(
+            id: "account-device-info-alert",
             message: message,
             buttons: [AlertAction(
                 title: NSLocalizedString(
@@ -176,6 +184,7 @@ final class AccountCoordinator: Coordinator, Presentable, Presenting {
             )]
         )
 
-        applicationRouter?.present(.alert(presentation), animated: true)
+        let presenter = AlertPresenter(context: self)
+        presenter.showAlert(presentation: presentation, animated: true)
     }
 }
diff --git a/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift b/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift
@@ -155,8 +155,8 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo
         case .welcome:
             presentWelcome(animated: animated, completion: completion)
 
-        case let .alert(presentation):
-            presentAlert(presentation: presentation, animated: animated, completion: completion)
+        case let .alert(presentation, context):
+            presentAlert(presentation: presentation, context: context, animated: animated, completion: completion)
         }
     }
 
@@ -564,11 +564,10 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo
         )
 
         coordinator.didFinishPayment = { [weak self] _ in
-            guard let self else { return }
+            guard let self = self else { return }
 
             if shouldDismissOutOfTime() {
                 router.dismiss(.outOfTime, animated: true)
-
                 continueFlow(animated: true)
             }
         }
@@ -589,7 +588,7 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo
         )
 
         coordinator.didFinish = { [weak self] _ in
-            guard let self else { return }
+            guard let self = self else { return }
             appPreferences.isShownOnboarding = true
             router.dismiss(.welcome, animated: false)
             continueFlow(animated: false)
@@ -643,18 +642,20 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo
 
     private func presentAlert(
         presentation: AlertPresentation,
+        context: Coordinator,
         animated: Bool,
         completion: @escaping (Coordinator) -> Void
     ) {
         let coordinator = AlertCoordinator(presentation: presentation)
 
         coordinator.didFinish = { [weak self] in
-            self?.router.dismiss(.alert(presentation))
+            self?.router.dismiss(.alert(presentation, context))
         }
 
         coordinator.start()
 
-        presentChild(coordinator, animated: animated) {
+        let context = (context as? (any Presenting))
+        presentChild(coordinator, context: context, animated: animated) {
             completion(coordinator)
         }
     }

diff --git a/ios/MullvadVPN/Coordinators/InAppPurchaseCoordinator.swift b/ios/MullvadVPN/Coordinators/InAppPurchaseCoordinator.swift
@@ -11,13 +11,17 @@ import Routing
 import StoreKit
 import UIKit
 
-class InAppPurchaseCoordinator: Coordinator, Presentable {
+class InAppPurchaseCoordinator: Coordinator, Presenting, Presentable {
     private let navigationController: RootContainerViewController
     private let interactor: InAppPurchaseInteractor
 
     var didFinish: ((InAppPurchaseCoordinator) -> Void)?
     var didCancel: ((InAppPurchaseCoordinator) -> Void)?
 
+    var presentationContext: UIViewController {
+        navigationController
+    }
+
     var presentedViewController: UIViewController {
         navigationController
     }
@@ -50,6 +54,7 @@ class InAppPurchaseCoordinator: Coordinator, Presentable {
 
             case let .failure(failure):
                 let presentation = AlertPresentation(
+                    id: "in-app-purchase-error-alert",
                     icon: .alert,
                     message: failure.error.localizedDescription,
                     buttons: [
@@ -69,7 +74,8 @@ class InAppPurchaseCoordinator: Coordinator, Presentable {
                     ]
                 )
 
-                applicationRouter?.present(.alert(presentation), animated: true)
+                let presenter = AlertPresenter(context: self)
+                presenter.showAlert(presentation: presentation, animated: true)
             }
         }
     }

diff --git a/ios/MullvadVPN/Coordinators/LoginCoordinator.swift b/ios/MullvadVPN/Coordinators/LoginCoordinator.swift
@@ -12,7 +12,7 @@ import Operations
 import Routing
 import UIKit
 
-final class LoginCoordinator: Coordinator, DeviceManagementViewControllerDelegate {
+final class LoginCoordinator: Coordinator, Presenting, DeviceManagementViewControllerDelegate {
     private let tunnelManager: TunnelManager
     private let devicesProxy: REST.DevicesProxy
 
@@ -22,6 +22,10 @@ final class LoginCoordinator: Coordinator, DeviceManagementViewControllerDelegat
     var didFinish: ((LoginCoordinator) -> Void)?
     var didCreateAccount: (() -> Void)?
 
+    var presentationContext: UIViewController {
+        navigationController
+    }
+
     let navigationController: RootContainerViewController
 
     init(
@@ -107,11 +111,12 @@ final class LoginCoordinator: Coordinator, DeviceManagementViewControllerDelegat
         )
         let controller = DeviceManagementViewController(
             interactor: interactor,
-            alertPresenter: AlertPresenter(coordinator: self)
+            alertPresenter: AlertPresenter(context: self)
         )
         controller.delegate = self
+
         controller.fetchDevices(animateUpdates: false) { [weak self] result in
-            guard let self else { return }
+            guard let self = self else { return }
 
             switch result {
             case .success:

diff --git a/ios/MullvadVPN/Coordinators/OutOfTimeCoordinator.swift b/ios/MullvadVPN/Coordinators/OutOfTimeCoordinator.swift
@@ -9,13 +9,17 @@
 import Routing
 import UIKit
 
-class OutOfTimeCoordinator: Coordinator, OutOfTimeViewControllerDelegate {
+class OutOfTimeCoordinator: Coordinator, Presenting, OutOfTimeViewControllerDelegate {
     let navigationController: RootContainerViewController
     let storePaymentManager: StorePaymentManager
     let tunnelManager: TunnelManager
 
     var didFinishPayment: ((OutOfTimeCoordinator) -> Void)?
 
+    var presentationContext: UIViewController {
+        navigationController
+    }
+
     private(set) var isMakingPayment = false
     private var viewController: OutOfTimeViewController?
 
@@ -42,7 +46,7 @@ class OutOfTimeCoordinator: Coordinator, OutOfTimeViewControllerDelegate {
 
         let controller = OutOfTimeViewController(
             interactor: interactor,
-            errorPresenter: PaymentAlertPresenter(coordinator: self)
+            errorPresenter: PaymentAlertPresenter(alertContext: self)
         )
 
         controller.delegate = self

diff --git a/ios/MullvadVPN/Coordinators/SettingsCoordinator.swift b/ios/MullvadVPN/Coordinators/SettingsCoordinator.swift
@@ -159,13 +159,13 @@ final class SettingsCoordinator: Coordinator, Presentable, Presenting, SettingsV
         case .preferences:
             return PreferencesViewController(
                 interactor: interactorFactory.makePreferencesInteractor(),
-                alertPresenter: AlertPresenter(coordinator: self)
+                alertPresenter: AlertPresenter(context: self)
             )
 
         case .problemReport:
             return ProblemReportViewController(
                 interactor: interactorFactory.makeProblemReportInteractor(),
-                alertPresenter: AlertPresenter(coordinator: self)
+                alertPresenter: AlertPresenter(context: self)
             )
 
         case .faq:

diff --git a/ios/MullvadVPN/Coordinators/TunnelCoordinator.swift b/ios/MullvadVPN/Coordinators/TunnelCoordinator.swift
@@ -9,12 +9,16 @@
 import Routing
 import UIKit
 
-class TunnelCoordinator: Coordinator {
+class TunnelCoordinator: Coordinator, Presenting {
     private let tunnelManager: TunnelManager
     private let controller: TunnelViewController
 
     private var tunnelObserver: TunnelObserver?
 
+    var presentationContext: UIViewController {
+        controller
+    }
+
     var rootViewController: UIViewController {
         controller
     }
@@ -59,6 +63,7 @@ class TunnelCoordinator: Coordinator {
 
     private func showCancelTunnelAlert() {
         let presentation = AlertPresentation(
+            id: "main-cancel-tunnel-alert",
             icon: .alert,
             message: NSLocalizedString(
                 "CANCEL_TUNNEL_ALERT_MESSAGE",
@@ -91,6 +96,7 @@ class TunnelCoordinator: Coordinator {
             ]
         )
 
-        applicationRouter?.present(.alert(presentation), animated: true)
+        let presenter = AlertPresenter(context: self)
+        presenter.showAlert(presentation: presentation, animated: true)
     }
 }
diff --git a/ios/MullvadVPN/Coordinators/WelcomeCoordinator.swift b/ios/MullvadVPN/Coordinators/WelcomeCoordinator.swift
@@ -102,6 +102,7 @@ extension WelcomeCoordinator: WelcomeViewControllerDelegate {
         )
 
         let presentation = AlertPresentation(
+            id: "welcome-device-name-alert",
             icon: .info,
             message: message,
             buttons: [
@@ -117,7 +118,8 @@ extension WelcomeCoordinator: WelcomeViewControllerDelegate {
             ]
         )
 
-        applicationRouter?.present(.alert(presentation), animated: true)
+        let presenter = AlertPresenter(context: self)
+        presenter.showAlert(presentation: presentation, animated: true)
     }
 
     func didRequestToPurchaseCredit(controller: WelcomeViewController, accountNumber: String, product: SKProduct) {
@@ -150,7 +152,7 @@ extension WelcomeCoordinator: WelcomeViewControllerDelegate {
         )
 
         coordinator.didCancel = { [weak self] coordinator in
-            guard let self else { return }
+            guard let self = self else { return }
             navigationController.popViewController(animated: true)
             coordinator.removeFromParent()
         }

diff --git a/ios/MullvadVPN/SceneDelegate.swift b/ios/MullvadVPN/SceneDelegate.swift
@@ -27,6 +27,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, SettingsMigrationUIHand
     private var tunnelObserver: TunnelObserver?
 
     private var appDelegate: AppDelegate {
+        // swiftlint:disable:next force_cast
         UIApplication.shared.delegate as! AppDelegate
     }
 
@@ -185,7 +186,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, SettingsMigrationUIHand
     // MARK: - SettingsMigrationUIHandler
 
     func showMigrationError(_ error: Error, completionHandler: @escaping () -> Void) {
+        guard let appCoordinator else {
+            completionHandler()
+            return
+        }
+
         let presentation = AlertPresentation(
+            id: "settings-migration-error-alert",
             title: NSLocalizedString(
                 "ALERT_TITLE",
                 tableName: "SettingsMigrationUI",
@@ -204,7 +211,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, SettingsMigrationUIHand
             ]
         )
 
-        appCoordinator?.router.present(.alert(presentation), animated: true) ?? completionHandler()
+        let presenter = AlertPresenter(context: appCoordinator)
+        presenter.showAlert(presentation: presentation, animated: true)
     }
 
     private static func migrationErrorReason(_ error: Error) -> String {

diff --git a/ios/MullvadVPN/View controllers/Account/PaymentAlertPresenter.swift b/ios/MullvadVPN/View controllers/Account/PaymentAlertPresenter.swift
@@ -10,14 +10,15 @@ import MullvadREST
 import Routing
 
 struct PaymentAlertPresenter {
-    let coordinator: Coordinator
+    let alertContext: any Presenting
 
     func showAlertForError(
         _ error: StorePaymentManagerError,
         context: REST.CreateApplePaymentResponse.Context,
         completion: (() -> Void)? = nil
     ) {
         let presentation = AlertPresentation(
+            id: "payment-error-alert",
             title: context.errorTitle,
             message: error.displayErrorDescription,
             buttons: [
@@ -31,7 +32,8 @@ struct PaymentAlertPresenter {
             ]
         )
 
-        coordinator.applicationRouter?.present(.alert(presentation), animated: true)
+        let presenter = AlertPresenter(context: alertContext)
+        presenter.showAlert(presentation: presentation, animated: true)
     }
 
     func showAlertForResponse(
@@ -45,6 +47,7 @@ struct PaymentAlertPresenter {
         }
 
         let presentation = AlertPresentation(
+            id: "payment-response-alert",
             title: response.alertTitle(context: context),
             message: response.alertMessage(context: context),
             buttons: [
@@ -58,7 +61,8 @@ struct PaymentAlertPresenter {
             ]
         )
 
-        coordinator.applicationRouter?.present(.alert(presentation), animated: true)
+        let presenter = AlertPresenter(context: alertContext)
+        presenter.showAlert(presentation: presentation, animated: true)
     }
 
     private func okButtonTextForKey(_ key: String) -> String {