KM-5043: Dismiss any other view that is presented before presenting F…

…orce Update screen (#172)
pia-foss · Oct 10, 2024 · effc428 · effc428
1 parent 952eed3
commit effc428
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/PIA VPN/DashboardViewController.swift b/PIA VPN/DashboardViewController.swift
@@ -706,7 +706,20 @@ class DashboardViewController: AutolayoutViewController {
         let forceUpdate = ForceUpdateViewController()
         forceUpdate.modalPresentationStyle = .fullScreen
         DispatchQueue.main.async { [weak self] in
-            self?.present(forceUpdate, animated: false)
+            var isOtherViewPresented = false
+            if let presented = self?.presentedViewController {
+                if !(presented is ForceUpdateViewController) {
+                    isOtherViewPresented = true
+                }
+            }
+
+            if isOtherViewPresented {
+                self?.dismiss(animated: false, completion: {
+                    self?.present(forceUpdate, animated: false)
+                })
+            } else {
+                self?.present(forceUpdate, animated: false)
+            }
         }
     }
 

diff --git a/PIA VPN/PIAWelcomeViewController.swift b/PIA VPN/PIAWelcomeViewController.swift
@@ -209,7 +209,20 @@ public class PIAWelcomeViewController: AutolayoutViewController, WelcomeCompleti
         let forceUpdate = ForceUpdateViewController()
         forceUpdate.modalPresentationStyle = .fullScreen
         DispatchQueue.main.async { [weak self] in
-            self?.present(forceUpdate, animated: false)
+            var isOtherViewPresented = false
+            if let presented = self?.presentedViewController {
+                if !(presented is ForceUpdateViewController) {
+                    isOtherViewPresented = true
+                }
+            }
+
+            if isOtherViewPresented {
+                self?.dismiss(animated: false, completion: {
+                    self?.present(forceUpdate, animated: false)
+                })
+            } else {
+                self?.present(forceUpdate, animated: false)
+            }
         }
     }