UI window scene (#4172)

marinofaggiana · web-flow · commit 7bcd4d2e8c86 · 2026-07-09T07:11:01.000+02:00
* resolvedWindow

Signed-off-by: Marino Faggiana &lt;marino.faggiana@nextcloud.com&gt;

* wip

Signed-off-by: Marino Faggiana &lt;marino.faggiana@nextcloud.com&gt;

* fix

Signed-off-by: Marino Faggiana &lt;marino.faggiana@nextcloud.com&gt;

---------

Signed-off-by: Marino Faggiana &lt;marino.faggiana@nextcloud.com&gt;
diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj
@@ -789,6 +789,8 @@
 		F7C55CCA2FB5CE74004A974F /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F7C55CC42FB5CE74004A974F /* Images.xcassets */; };
 		F7C55CCC2FB5CE74004A974F /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7C55CC72FB5CE74004A974F /* MainInterface.storyboard */; };
 		F7C630712FFE206100257EEB /* NCMediaMetadataBackgroundProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C630702FFE206100257EEB /* NCMediaMetadataBackgroundProcessor.swift */; };
+		F7C6307F2FFE4F8000257EEB /* UIWindowScene+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C6307E2FFE4F8000257EEB /* UIWindowScene+Extension.swift */; };
+		F7C630802FFE4F8000257EEB /* UIWindowScene+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C6307E2FFE4F8000257EEB /* UIWindowScene+Extension.swift */; };
 		F7C687E92D22BD46004757BC /* NCManageDatabase+RecommendedFiles.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C687E82D22BD46004757BC /* NCManageDatabase+RecommendedFiles.swift */; };
 		F7C687EA2D22BDE5004757BC /* NCManageDatabase+RecommendedFiles.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C687E82D22BD46004757BC /* NCManageDatabase+RecommendedFiles.swift */; };
 		F7C687EB2D22BDE5004757BC /* NCManageDatabase+RecommendedFiles.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C687E82D22BD46004757BC /* NCManageDatabase+RecommendedFiles.swift */; };
@@ -1808,6 +1810,7 @@
 		F7C55CC42FB5CE74004A974F /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		F7C55CC62FB5CE74004A974F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
 		F7C630702FFE206100257EEB /* NCMediaMetadataBackgroundProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMediaMetadataBackgroundProcessor.swift; sourceTree = "<group>"; };
+		F7C6307E2FFE4F8000257EEB /* UIWindowScene+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIWindowScene+Extension.swift"; sourceTree = "<group>"; };
 		F7C687E82D22BD46004757BC /* NCManageDatabase+RecommendedFiles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCManageDatabase+RecommendedFiles.swift"; sourceTree = "<group>"; };
 		F7C7B488245EBA4100D93E60 /* NCViewerQuickLook.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCViewerQuickLook.swift; sourceTree = "<group>"; };
 		F7C9555221F0C4CA0024296E /* NCActivity.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCActivity.storyboard; sourceTree = "<group>"; };
@@ -3029,6 +3032,7 @@
 				AFCE353227E4ED1900FEA6C2 /* UIToolbar+Extension.swift */,
 				F7E41315294A19B300839300 /* UIView+Extension.swift */,
 				F77BB745289984CA0090FC19 /* UIViewController+Extension.swift */,
+				F7C6307E2FFE4F8000257EEB /* UIWindowScene+Extension.swift */,
 				F7E8A390295DC5E0006CB2D0 /* View+Extension.swift */,
 			);
 			path = Extensions;
@@ -4523,6 +4527,7 @@
 				F78295311F962EFA00A572F5 /* NCEndToEndEncryption.m in Sources */,
 				F7C30DFE291BD0B80017149B /* NCNetworkingE2EEDelete.swift in Sources */,
 				F7D4BF2C2CA2E8D800A5E746 /* TOPasscodeKeypadView.m in Sources */,
+				F7C630802FFE4F8000257EEB /* UIWindowScene+Extension.swift in Sources */,
 				F7D4BF2D2CA2E8D800A5E746 /* TOPasscodeSettingsKeypadView.m in Sources */,
 				F7D4BF2E2CA2E8D800A5E746 /* TOPasscodeFixedInputView.m in Sources */,
 				F7D61EA92EBF1694007F865B /* NCManageDatabase+TableCapabilities.swift in Sources */,
@@ -5087,6 +5092,7 @@
 				F77C3F5B2D9BF8CD00F3C471 /* UITabBar+Extension.swift in Sources */,
 				F7D7A76E2DCDD437003D2007 /* NCManageDatabase+AutoUpload.swift in Sources */,
 				F7F563042E15762B00631A11 /* MigrationMultiDomains.swift in Sources */,
+				F7C6307F2FFE4F8000257EEB /* UIWindowScene+Extension.swift in Sources */,
 				F75CA1472962F13700B01130 /* NCHUDView.swift in Sources */,
 				F77BB748289985270090FC19 /* UITabBarController+Extension.swift in Sources */,
 				F7DA0F672F66AA0D0033020C /* ShowBanner.swift in Sources */,
diff --git a/iOSClient/Extensions/UIWindowScene+Extension.swift b/iOSClient/Extensions/UIWindowScene+Extension.swift
@@ -0,0 +1,45 @@
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2026 Marino Faggiana
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import UIKit
+
+extension UIWindowScene {
+    @MainActor
+    var resolvedWindow: UIWindow? {
+        if let window = resolvedWindow(in: [self]) {
+            return window
+        }
+
+#if !EXTENSION
+        let scenes = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+
+        if let window = resolvedWindow(
+            in: scenes.filter { $0.activationState == .foregroundActive }
+        ) {
+            return window
+        }
+
+        if let window = resolvedWindow(
+            in: scenes.filter { $0.activationState == .foregroundInactive }
+        ) {
+            return window
+        }
+
+        return resolvedWindow(in: scenes)
+#else
+        return nil
+#endif
+    }
+
+    @MainActor
+    private func resolvedWindow(in scenes: [UIWindowScene]) -> UIWindow? {
+        let windows = scenes.flatMap { $0.windows }
+
+        return windows.first(where: \.isKeyWindow) ??
+            windows.first(where: { !$0.isHidden && $0.alpha > 0 }) ??
+            windows.first(where: { !$0.isHidden }) ??
+            windows.first
+    }
+}
diff --git a/iOSClient/GUI/Lucid Banner/AlertActionBannerView.swift b/iOSClient/GUI/Lucid Banner/AlertActionBannerView.swift
@@ -13,7 +13,7 @@ func showAlertActionBanner(lucidBanner: LucidBanner?,
                            onConfirm: (() -> Void)? = nil) {
     guard let lucidBanner,
           let windowScene,
-          let window = windowScene.windows.first(where: \.isKeyWindow) else {
+          let window = windowScene.resolvedWindow else {
         return
     }
     let horizontalLayout = horizontalLayoutBanner(bounds: window.bounds,
diff --git a/iOSClient/GUI/Lucid Banner/ErrorBannerView.swift b/iOSClient/GUI/Lucid Banner/ErrorBannerView.swift
@@ -24,7 +24,7 @@ func showErrorBanner(windowScene: UIWindowScene?,
                      errorCode: Int? = nil,
                      afError: AFError? = nil) async {
     guard let windowScene,
-          let window = windowScene.windows.first(where: \.isKeyWindow) else {
+          let window = windowScene.resolvedWindow else {
         return
     }
 
diff --git a/iOSClient/GUI/Lucid Banner/HudBannerView.swift b/iOSClient/GUI/Lucid Banner/HudBannerView.swift
@@ -12,7 +12,7 @@ func showHudBanner(windowScene: UIWindowScene?,
                    stage: LucidBanner.Stage? = nil,
                    onButtonTap: (() -> Void)? = nil) -> (banner: LucidBanner?, token: Int?) {
     guard let windowScene,
-          let window = windowScene.windows.first(where: \.isKeyWindow) else {
+          let window = windowScene.resolvedWindow else {
         return (nil, nil)
     }
     let localizedTitle = title.map { NSLocalizedString($0, comment: "") }
diff --git a/iOSClient/GUI/Lucid Banner/HudIndeterminateBannerView.swift b/iOSClient/GUI/Lucid Banner/HudIndeterminateBannerView.swift
@@ -12,7 +12,7 @@ func showHudIndeterminateBanner(windowScene: UIWindowScene?,
                                 stage: LucidBanner.Stage? = nil,
                                 onButtonTap: (() -> Void)? = nil) -> (banner: LucidBanner?, token: Int?) {
     guard let windowScene,
-          let window = windowScene.windows.first(where: \.isKeyWindow) else {
+          let window = windowScene.resolvedWindow else {
         return (nil, nil)
     }
     let localizedTitle = title.map { NSLocalizedString($0, comment: "") }
diff --git a/iOSClient/GUI/Lucid Banner/InfoBannerView.swift b/iOSClient/GUI/Lucid Banner/InfoBannerView.swift
@@ -14,7 +14,7 @@ func showInfoBanner(windowScene: UIWindowScene?,
                     footnote: String? = nil,
                     errorCode: Int? = nil) async {
     guard let windowScene,
-          let window = windowScene.windows.first(where: \.isKeyWindow) else {
+          let window = windowScene.resolvedWindow else {
         return
     }
 
diff --git a/iOSClient/GUI/Lucid Banner/ShowBanner.swift b/iOSClient/GUI/Lucid Banner/ShowBanner.swift
@@ -27,7 +27,7 @@ func showBanner(windowScene: UIWindowScene?,
                 policy: LucidBanner.ShowPolicy = .replace,
                 errorCode: Int? = nil) async -> (banner: LucidBanner?, token: Int?) {
     guard let windowScene,
-          let window = windowScene.windows.first(where: \.isKeyWindow) else {
+          let window = windowScene.resolvedWindow else {
         return(nil, nil)
     }
 
diff --git a/iOSClient/GUI/Lucid Banner/UploadBannerView.swift b/iOSClient/GUI/Lucid Banner/UploadBannerView.swift
@@ -11,7 +11,7 @@ func showUploadBanner(windowScene: UIWindowScene?,
                       allowMinimizeOnTap: Bool,
                       onButtonTap: (() -> Void)? = nil) -> (banner: LucidBanner?, token: Int?) {
     guard let windowScene,
-          let window = windowScene.windows.first(where: \.isKeyWindow) else {
+          let window = windowScene.resolvedWindow else {
         return (nil, nil)
     }
     let horizontalLayout = horizontalLayoutBanner(bounds: window.bounds,
diff --git a/iOSClient/GUI/Lucid Banner/WarningBannerView.swift b/iOSClient/GUI/Lucid Banner/WarningBannerView.swift
@@ -16,7 +16,7 @@ func showWarningBanner(windowScene: UIWindowScene?,
                        imageAnimation: LucidBanner.LucidBannerAnimationStyle,
                        errorCode: Int? = nil) async {
     guard let windowScene,
-          let window = windowScene.windows.first(where: \.isKeyWindow) else {
+          let window = windowScene.resolvedWindow else {
         return
     }
 
diff --git a/iOSClient/SceneDelegate.swift b/iOSClient/SceneDelegate.swift
@@ -675,27 +675,36 @@ final class SceneManager {
         // Try exact match via your registry
         if let sceneIdentifier,
            let controller = sceneController.keys.first(where: { $0.sceneIdentifier == sceneIdentifier }),
-           let scene = sceneController[controller] {
-            return getWindow(scene: scene)
+           let scene = sceneController[controller],
+           let window = getWindow(scene: scene)?.windowScene?.resolvedWindow {
+            return window
         }
 
+        let windowScenes = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+
         // Fallback: prefer a foregroundActive window scene
-        if let active = UIApplication.shared.connectedScenes
-            .compactMap({ $0 as? UIWindowScene })
-            .first(where: { $0.activationState == .foregroundActive }),
-           let w = active.keyWindow {
-            return w
+        if let window = windowScenes
+            .first(where: { $0.activationState == .foregroundActive })?
+            .resolvedWindow {
+            return window
         }
 
-        // Last resort: first connected window scene
-        if let any = UIApplication.shared.connectedScenes
-            .compactMap({ $0 as? UIWindowScene })
-            .first,
-           let w = any.keyWindow {
-            return w
+        // Fallback: foregroundInactive window scene
+        if let window = windowScenes
+            .first(where: { $0.activationState == .foregroundInactive })?
+            .resolvedWindow {
+            return window
+        }
+
+        // Last resort: first connected window scene with a resolved window
+        if let window = windowScenes
+            .compactMap({ $0.resolvedWindow })
+            .first {
+            return window
         }
 
-        // Absolute last resort (if you keep it)
+        // Absolute last resort
         return UIApplication.shared.mainAppWindow
     }
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ func showAlertActionBanner(lucidBanner: LucidBanner?,`
`13`	`13`	`onConfirm: (() -> Void)? = nil) {`
`14`	`14`	`guard let lucidBanner,`
`15`	`15`	`let windowScene,`
`16`		`- let window = windowScene.windows.first(where: \.isKeyWindow) else {`
	`16`	`+ let window = windowScene.resolvedWindow else {`
`17`	`17`	`return`
`18`	`18`	`}`
`19`	`19`	`let horizontalLayout = horizontalLayoutBanner(bounds: window.bounds,`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func showErrorBanner(windowScene: UIWindowScene?,`
`24`	`24`	`errorCode: Int? = nil,`
`25`	`25`	`afError: AFError? = nil) async {`
`26`	`26`	`guard let windowScene,`
`27`		`- let window = windowScene.windows.first(where: \.isKeyWindow) else {`
	`27`	`+ let window = windowScene.resolvedWindow else {`
`28`	`28`	`return`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ func showHudBanner(windowScene: UIWindowScene?,`
`12`	`12`	`stage: LucidBanner.Stage? = nil,`
`13`	`13`	`onButtonTap: (() -> Void)? = nil) -> (banner: LucidBanner?, token: Int?) {`
`14`	`14`	`guard let windowScene,`
`15`		`- let window = windowScene.windows.first(where: \.isKeyWindow) else {`
	`15`	`+ let window = windowScene.resolvedWindow else {`
`16`	`16`	`return (nil, nil)`
`17`	`17`	`}`
`18`	`18`	`let localizedTitle = title.map { NSLocalizedString($0, comment: "") }`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ func showHudIndeterminateBanner(windowScene: UIWindowScene?,`
`12`	`12`	`stage: LucidBanner.Stage? = nil,`
`13`	`13`	`onButtonTap: (() -> Void)? = nil) -> (banner: LucidBanner?, token: Int?) {`
`14`	`14`	`guard let windowScene,`
`15`		`- let window = windowScene.windows.first(where: \.isKeyWindow) else {`
	`15`	`+ let window = windowScene.resolvedWindow else {`
`16`	`16`	`return (nil, nil)`
`17`	`17`	`}`
`18`	`18`	`let localizedTitle = title.map { NSLocalizedString($0, comment: "") }`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ func showInfoBanner(windowScene: UIWindowScene?,`
`14`	`14`	`footnote: String? = nil,`
`15`	`15`	`errorCode: Int? = nil) async {`
`16`	`16`	`guard let windowScene,`
`17`		`- let window = windowScene.windows.first(where: \.isKeyWindow) else {`
	`17`	`+ let window = windowScene.resolvedWindow else {`
`18`	`18`	`return`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func showBanner(windowScene: UIWindowScene?,`
`27`	`27`	`policy: LucidBanner.ShowPolicy = .replace,`
`28`	`28`	`errorCode: Int? = nil) async -> (banner: LucidBanner?, token: Int?) {`
`29`	`29`	`guard let windowScene,`
`30`		`- let window = windowScene.windows.first(where: \.isKeyWindow) else {`
	`30`	`+ let window = windowScene.resolvedWindow else {`
`31`	`31`	`return(nil, nil)`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ func showUploadBanner(windowScene: UIWindowScene?,`
`11`	`11`	`allowMinimizeOnTap: Bool,`
`12`	`12`	`onButtonTap: (() -> Void)? = nil) -> (banner: LucidBanner?, token: Int?) {`
`13`	`13`	`guard let windowScene,`
`14`		`- let window = windowScene.windows.first(where: \.isKeyWindow) else {`
	`14`	`+ let window = windowScene.resolvedWindow else {`
`15`	`15`	`return (nil, nil)`
`16`	`16`	`}`
`17`	`17`	`let horizontalLayout = horizontalLayoutBanner(bounds: window.bounds,`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func showWarningBanner(windowScene: UIWindowScene?,`
`16`	`16`	`imageAnimation: LucidBanner.LucidBannerAnimationStyle,`
`17`	`17`	`errorCode: Int? = nil) async {`
`18`	`18`	`guard let windowScene,`
`19`		`- let window = windowScene.windows.first(where: \.isKeyWindow) else {`
	`19`	`+ let window = windowScene.resolvedWindow else {`
`20`	`20`	`return`
`21`	`21`	`}`
`22`	`22`