Merge pull request #454 from ivpn/bugfix/privacy-overlay

[iOS 18] Privacy overlay not appearing when entering background
ivpn · Sep 17, 2024 · 68101ea · 68101ea
2 parents d79e2f3 + f7ad688
commit 68101ea
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 21 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/Managers/ConnectionManager.swift b/IVPNClient/Managers/ConnectionManager.swift
@@ -96,9 +96,6 @@ class ConnectionManager {
                     self.updateOpenVPNLogFile()
                     self.updateWireGuardLogFile()
                     self.reconnectAutomatically = false
-                    if self.actionType == .connect {
-                        self.evaluateCloseApp()
-                    }
                 }
                 DispatchQueue.delay(2.5) {
                     if UserDefaults.shared.isV2ray && !V2RayCore.shared.reconnectWithV2ray {
@@ -128,10 +125,6 @@ class ConnectionManager {
                     }
                 }
             }
-
-            if status == .disconnected && self.actionType == .disconnect {
-                self.evaluateCloseApp()
-            }
 
             completion(status)
         }
@@ -575,12 +568,10 @@ class ConnectionManager {
         }
     }
 
-    private func evaluateCloseApp() {
+    func evaluateCloseApp() {
         if closeApp {
             closeApp = false
-            DispatchQueue.delay(1.5) {
-                UIControl().sendAction(#selector(NSXPCConnection.suspend), to: UIApplication.shared, for: nil)
-            }
+            UIControl().sendAction(#selector(NSXPCConnection.suspend), to: UIApplication.shared, for: nil)
         }
     }
 

diff --git a/IVPNClient/Scenes/MainScreen/MainViewController.swift b/IVPNClient/Scenes/MainScreen/MainViewController.swift
@@ -167,6 +167,9 @@ class MainViewController: UIViewController {
                 if !model.isIvpnServer {
                     Application.shared.geoLookup = model
                 }
+
+                WidgetCenter.shared.reloadTimelines(ofKind: "IVPNWidget")
+                Application.shared.connectionManager.evaluateCloseApp()
             case .failure:
                 controlPanel.controlPanelView.ipv4ViewModel = ProofsViewModel(displayMode: .error)
                 mainView.infoAlertViewModel.infoAlert = .connectionInfoFailure
@@ -180,6 +183,8 @@ class MainViewController: UIViewController {
             case .success(let model):
                 controlPanel.controlPanelView.ipv6ViewModel = ProofsViewModel(model: model, displayMode: .content)
                 mainView.ipv6ViewModel = ProofsViewModel(model: model)
+                WidgetCenter.shared.reloadTimelines(ofKind: "IVPNWidget")
+                Application.shared.connectionManager.evaluateCloseApp()
             case .failure:
                 controlPanel.controlPanelView.ipv6ViewModel = ProofsViewModel(displayMode: .error)
                 mainView.ipv6ViewModel = ProofsViewModel(displayMode: .error)

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)