🐛 Add fallback in the case where there’s no active window scene

appcues · Nov 8, 2024 · f627f69 · f627f69
1 parent ae53fa3
commit f627f69
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Sources/AppcuesKit/Presentation/Actions/Appcues/AppcuesRequestReviewAction.swift b/Sources/AppcuesKit/Presentation/Actions/Appcues/AppcuesRequestReviewAction.swift
@@ -19,7 +19,7 @@ internal class AppcuesRequestReviewAction: AppcuesExperienceAction {
     }
 
     func execute(completion: @escaping ActionRegistry.Completion) {
-        if #available(iOS 14.0, *), let windowScene = UIApplication.shared.activeWindowScenes.first {
+        if #available(iOS 14.0, *), let windowScene = UIApplication.shared.mainWindowScene {
             SKStoreReviewController.requestReview(in: windowScene)
         } else {
             SKStoreReviewController.requestReview()

diff --git a/Sources/AppcuesKit/Presentation/Debugger/UIDebugger.swift b/Sources/AppcuesKit/Presentation/Debugger/UIDebugger.swift
@@ -103,7 +103,7 @@ internal class UIDebugger: UIDebugging {
 
         // Set up the debugger
 
-        guard let windowScene = UIApplication.shared.activeWindowScenes.first else {
+        guard let windowScene = UIApplication.shared.mainWindowScene else {
             config.logger.error("Could not open debugger")
             return
         }
@@ -161,7 +161,7 @@ internal class UIDebugger: UIDebugging {
         }
 
         // One-time on-demand set up of the toast window
-        if toastWindow == nil, let windowScene = UIApplication.shared.activeWindowScenes.first {
+        if toastWindow == nil, let windowScene = UIApplication.shared.mainWindowScene {
             toastWindow = ToastUIWindow(windowScene: windowScene)
         }
 

diff --git a/Sources/AppcuesKit/Presentation/ExperienceRendering/ModalContextManager.swift b/Sources/AppcuesKit/Presentation/ExperienceRendering/ModalContextManager.swift
@@ -18,8 +18,8 @@ internal class ModalContextManager {
             return
         }
 
-        guard let windowScene = UIApplication.shared.activeWindowScenes.first else {
-            throw AppcuesTraitError(description: "No active window scene")
+        guard let windowScene = UIApplication.shared.mainWindowScene else {
+            throw AppcuesTraitError(description: "No main window scene")
         }
 
         let window = AppcuesUIWindow(windowScene: windowScene)

diff --git a/Sources/AppcuesKit/Presentation/Extensions/UIApplication+TopViewController.swift b/Sources/AppcuesKit/Presentation/Extensions/UIApplication+TopViewController.swift
@@ -24,12 +24,18 @@ internal protocol URLOpening {
 extension UIApplication: TopControllerGetting {
 
     @available(iOS 13.0, *)
-    var activeWindowScenes: [UIWindowScene] {
+    private var activeWindowScenes: [UIWindowScene] {
         self.connectedScenes
             .filter { $0.activationState == .foregroundActive }
             .compactMap { $0 as? UIWindowScene }
     }
 
+    // Prefer the active window scene, but in the case where there's no active scene, use the one from the main app window.
+    @available(iOS 13.0, *)
+    var mainWindowScene: UIWindowScene? {
+        activeWindowScenes.first ?? windows.first(where: { !$0.isAppcuesWindow })?.windowScene
+    }
+
     // We expose this property because a unit test cannot init a UIWindowScene for mocking different states.
     var hasActiveWindowScenes: Bool {
         if #available(iOS 13.0, *) {