Fix alert presentation bug introduced with app restructuring (#376)

- Present alert using topmost view controller of root view controller
- Use window provider protocol to defer window resolution

Author: Darin Krauss

Loop/AppDelegate.swift

@@ -10,7 +10,7 @@ import UIKit
 import LoopKit
 
 @UIApplicationMain
-final class AppDelegate: UIResponder, UIApplicationDelegate {
+final class AppDelegate: UIResponder, UIApplicationDelegate, WindowProvider {
     var window: UIWindow?
 
     private let loopAppManager = LoopAppManager()
@@ -21,8 +21,8 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         log.default("%{public}@ with launchOptions: %{public}@", #function, String(describing: launchOptions))
 
-        loopAppManager.initialize(with: launchOptions)
-        loopAppManager.launch(into: window)
+        loopAppManager.initialize(windowProvider: self, launchOptions: launchOptions)
+        loopAppManager.launch()
         return loopAppManager.isLaunchComplete
     }
 
@@ -54,7 +54,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func applicationProtectedDataDidBecomeAvailable(_ application: UIApplication) {
         if !loopAppManager.isLaunchComplete {
-            loopAppManager.launch(into: window)
+            loopAppManager.launch()
         }
     }
 

Loop/Managers/LoopAppManager.swift

@@ -32,6 +32,10 @@ public extension AlertPresenter {
     func dismiss(animated: Bool) { dismiss(animated: animated, completion: nil) }
 }
 
+protocol WindowProvider: AnyObject {
+    var window: UIWindow? { get }
+}
+
 class LoopAppManager: NSObject {
     private enum State: Int {
         case initialize
@@ -43,8 +47,8 @@ class LoopAppManager: NSObject {
         var next: State { State(rawValue: rawValue + 1) ?? .launchComplete }
     }
 
+    private weak var windowProvider: WindowProvider?
     private var launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-    private var window: UIWindow?
 
     private var pluginManager: PluginManager!
     private var bluetoothStateManager: BluetoothStateManager!
@@ -60,18 +64,19 @@ class LoopAppManager: NSObject {
 
     // MARK: - Initialization
 
-    func initialize(with launchOptions: [UIApplication.LaunchOptionsKey: Any]?) {
+    func initialize(windowProvider: WindowProvider, launchOptions: [UIApplication.LaunchOptionsKey: Any]?) {
         dispatchPrecondition(condition: .onQueue(.main))
         precondition(state == .initialize)
 
+        self.windowProvider = windowProvider
         self.launchOptions = launchOptions
 
         registerBackgroundTasks()
 
         self.state = state.next
     }
 
-    func launch(into window: UIWindow?) {
+    func launch() {
         dispatchPrecondition(condition: .onQueue(.main))
         precondition(!isLaunchComplete)
         precondition(state != .initialize)
@@ -81,9 +86,7 @@ class LoopAppManager: NSObject {
             return
         }
 
-        self.window = window
-        
-        window?.tintColor = .loopAccent
+        windowProvider?.window?.tintColor = .loopAccent
         OrientationLock.deviceOrientationController = self
         UNUserNotificationCenter.current().delegate = self
 
@@ -128,7 +131,7 @@ class LoopAppManager: NSObject {
                                                    deviceDataManager: deviceDataManager,
                                                    servicesManager: deviceDataManager.servicesManager,
                                                    loopDataManager: deviceDataManager.loopManager,
-                                                   window: window,
+                                                   windowProvider: windowProvider,
                                                    userDefaults: UserDefaults.appGroup!)
 
         deviceDataManager.analyticsServicesManager.application(didFinishLaunchingWithOptions: launchOptions)
@@ -259,20 +262,20 @@ class LoopAppManager: NSObject {
     }
 
     private var rootViewController: UIViewController? {
-        get { window?.rootViewController }
-        set { window?.rootViewController = newValue }
+        get { windowProvider?.window?.rootViewController }
+        set { windowProvider?.window?.rootViewController = newValue }
     }
 }
 
 // MARK: - AlertPresenter
 
 extension LoopAppManager: AlertPresenter {
     func present(_ viewControllerToPresent: UIViewController, animated: Bool, completion: (() -> Void)?) {
-        rootViewController?.present(viewControllerToPresent, animated: animated, completion: completion)
+        rootViewController?.topmostViewController.present(viewControllerToPresent, animated: animated, completion: completion)
     }
 
     func dismiss(animated: Bool, completion: (() -> Void)?) {
-        rootViewController?.dismiss(animated: animated, completion: completion)
+        rootViewController?.topmostViewController.dismiss(animated: animated, completion: completion)
     }
 }
 

Loop/Managers/OnboardingManager.swift

@@ -16,7 +16,7 @@ class OnboardingManager {
     private let deviceDataManager: DeviceDataManager
     private let servicesManager: ServicesManager
     private let loopDataManager: LoopDataManager
-    private let window: UIWindow?
+    private weak var windowProvider: WindowProvider?
     private let userDefaults: UserDefaults
 
     private var isOnboarded: Bool {
@@ -31,13 +31,13 @@ class OnboardingManager {
 
     private var completion: (() -> Void)?
 
-    init(pluginManager: PluginManager, bluetoothProvider: BluetoothProvider, deviceDataManager: DeviceDataManager, servicesManager: ServicesManager, loopDataManager: LoopDataManager, window: UIWindow?, userDefaults: UserDefaults = .standard) {
+    init(pluginManager: PluginManager, bluetoothProvider: BluetoothProvider, deviceDataManager: DeviceDataManager, servicesManager: ServicesManager, loopDataManager: LoopDataManager, windowProvider: WindowProvider?, userDefaults: UserDefaults = .standard) {
         self.pluginManager = pluginManager
         self.bluetoothProvider = bluetoothProvider
         self.deviceDataManager = deviceDataManager
         self.servicesManager = servicesManager
         self.loopDataManager = loopDataManager
-        self.window = window
+        self.windowProvider = windowProvider
         self.userDefaults = userDefaults
 
         self.isOnboarded = userDefaults.onboardingManagerIsOnboarded
@@ -112,7 +112,7 @@ class OnboardingManager {
         onboardingViewController.serviceOnboardDelegate = servicesManager
         onboardingViewController.completionDelegate = self
 
-        window?.rootViewController = onboardingViewController
+        windowProvider?.window?.rootViewController = onboardingViewController
     }
 
     private func completeActiveOnboarding() {