fix(ui): update UIApplication+Ext.swift

ivpn · Sep 2, 2024 · 8d7c48b · 8d7c48b
1 parent e06ae71
commit 8d7c48b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/IVPNClient/AppDelegate.swift b/IVPNClient/AppDelegate.swift
@@ -96,16 +96,9 @@ class AppDelegate: UIResponder {
 
     private func showSecurityScreen() {
         var showWindow = false
+        let topVC = UIApplication.topViewController()
 
-        if UIApplication.topViewController() as? AccountViewController != nil {
-            showWindow = true
-        }
-
-        if UIApplication.topViewController() as? LoginViewController != nil {
-            showWindow = true
-        }
-
-        if UIApplication.topViewController() as? CreateAccountViewController != nil {
+        if topVC is AccountViewController || topVC is LoginViewController || topVC is CreateAccountViewController {
             showWindow = true
         }
 

diff --git a/IVPNClient/Utilities/Extensions/UIApplication+Ext.swift b/IVPNClient/Utilities/Extensions/UIApplication+Ext.swift
@@ -27,7 +27,7 @@ extension UIApplication {
 
     var keyWindow: UIWindow? {
         return self.connectedScenes
-            .filter { $0.activationState == .foregroundActive }
+            .filter { $0.activationState == .foregroundActive || $0.activationState == .foregroundInactive }
             .first(where: { $0 is UIWindowScene })
             .flatMap({ $0 as? UIWindowScene })?.windows
             .first(where: \.isKeyWindow)