@capgo/capacitor-updater 8.51.7 → 8.51.8

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java

@@ -146,7 +146,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     static final int APPLICATION_EXIT_REASON_USER_REQUESTED = 10;
     static final int APPLICATION_EXIT_REASON_DEPENDENCY_DIED = 12;
 
-    private final String pluginVersion = "8.51.7";
+    private final String pluginVersion = "8.51.8";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -96,7 +96,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     deinit {
         implementation.shutdown()
     }
-    private let pluginVersion: String = "8.51.7"
+    private let pluginVersion: String = "8.51.8"
     private let launchStartedAtMs = Int64(Date().timeIntervalSince1970 * 1000)
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"

package/ios/Sources/CapacitorUpdaterPlugin/ShakeMenu.swift

@@ -92,18 +92,26 @@ final class ThreeFingerPinchGestureRecognizer: UIGestureRecognizer {
 }
 
 extension UIApplication {
-    // swiftlint:disable:next line_length
-    public class func topViewController(_ base: UIViewController? = UIApplication.shared.windows.first?.rootViewController) -> UIViewController? {
-        if let nav = base as? UINavigationController {
+    public class func topViewController(_ base: UIViewController? = nil) -> UIViewController? {
+        let resolvedBase = base ?? keyWindowRootViewController
+        if let nav = resolvedBase as? UINavigationController {
             return topViewController(nav.visibleViewController)
         }
-        if let tab = base as? UITabBarController, let selected = tab.selectedViewController {
+        if let tab = resolvedBase as? UITabBarController, let selected = tab.selectedViewController {
             return topViewController(selected)
         }
-        if let presented = base?.presentedViewController {
+        if let presented = resolvedBase?.presentedViewController {
             return topViewController(presented)
         }
-        return base
+        return resolvedBase
+    }
+
+    private static var keyWindowRootViewController: UIViewController? {
+        let scenes = shared.connectedScenes.compactMap { $0 as? UIWindowScene }
+        let foregroundScenes = scenes.filter { $0.activationState == .foregroundActive }
+        let candidates = foregroundScenes.isEmpty ? scenes : foregroundScenes
+        let window = candidates.flatMap(\.windows).first(where: \.isKeyWindow) ?? candidates.first?.windows.first
+        return window?.rootViewController
     }
 }
 
@@ -184,6 +192,10 @@ extension CapacitorUpdaterPlugin: UIGestureRecognizerDelegate {
 }
 
 extension UIWindow {
+    private var menuHostViewController: UIViewController? {
+        UIApplication.topViewController(rootViewController)
+    }
+
     override open func motionEnded(_ motion: UIEvent.EventSubtype, with event: UIEvent?) {
         if motion == .motionShake {
             guard let bridgeViewController = rootViewController as? CAPBridgeViewController,
@@ -230,7 +242,7 @@ extension UIWindow {
     @discardableResult
     private func showDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) -> Bool {
         // Prevent multiple alerts from showing
-        guard let topVC = UIApplication.topViewController() else {
+        guard let topVC = self.menuHostViewController else {
             return false
         }
         if topVC.isKind(of: UIAlertController.self) {
@@ -365,7 +377,7 @@ extension UIWindow {
         })
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alertShake, animated: true)
             }
         }
@@ -388,7 +400,7 @@ extension UIWindow {
     }
 
     private func showPreviewSelector(plugin: CapacitorUpdaterPlugin) {
-        guard let topVC = UIApplication.topViewController() else {
+        guard let topVC = self.menuHostViewController else {
             return
         }
         if topVC.isKind(of: UIAlertController.self) {
@@ -456,7 +468,7 @@ extension UIWindow {
         alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -479,7 +491,7 @@ extension UIWindow {
         }
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -498,7 +510,7 @@ extension UIWindow {
     @discardableResult
     private func showChannelSelector(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) -> Bool {
         // Prevent multiple alerts from showing
-        guard let topVC = UIApplication.topViewController() else {
+        guard let topVC = self.menuHostViewController else {
             return false
         }
         if topVC.isKind(of: UIAlertController.self) {
@@ -582,7 +594,7 @@ extension UIWindow {
         }
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -627,7 +639,7 @@ extension UIWindow {
         alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -649,7 +661,7 @@ extension UIWindow {
         ])
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(progressAlert, animated: true) {
                     DispatchQueue.global(qos: .userInitiated).async {
                         // Set the channel - respect plugin's allowSetDefaultChannel config
@@ -806,7 +818,7 @@ extension UIWindow {
         alert.addAction(UIAlertAction(title: "OK", style: .default))
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -818,7 +830,7 @@ extension UIWindow {
         alert.addAction(UIAlertAction(title: "OK", style: .default))
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -844,7 +856,7 @@ extension UIWindow {
         })
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "8.51.7",
+  "version": "8.51.8",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",
@@ -81,11 +81,11 @@
     "generate:rsa-contract": "bun scripts/generate-rsa-contract-fixtures.mjs"
   },
   "devDependencies": {
-    "@capacitor/android": "^8.0.0",
-    "@capacitor/cli": "^8.0.0",
-    "@capacitor/core": "^8.0.0",
+    "@capacitor/android": "^8.5.0",
+    "@capacitor/cli": "^8.5.0",
+    "@capacitor/core": "^8.5.0",
     "@capacitor/docgen": "^0.3.0",
-    "@capacitor/ios": "^8.0.0",
+    "@capacitor/ios": "^8.5.0",
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^2.0.0",