@capgo/capacitor-updater 8.47.9 → 8.47.10

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

@@ -2519,7 +2519,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
 
         final BundleInfo previewFallbackBundle = this.implementation.getPreviewFallbackBundle();
-        this.endPreviewSession();
+        this.endPreviewSession(true);
         final BundleInfo restoredNextBundle = this.implementation.getNextBundle();
         this.deletePreviewBundleIfUnused(previewBundle, previewFallbackBundle, restoredNextBundle);
         return true;

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

@@ -17,8 +17,8 @@ public class ShakeDetector implements SensorEventListener {
         void onShakeDetected();
     }
 
-    private static final float SHAKE_THRESHOLD = 12.0f; // Acceleration threshold for shake detection
-    private static final int SHAKE_TIMEOUT = 500; // Minimum time between shake events (ms)
+    private static final float SHAKE_THRESHOLD = 16.0f; // Acceleration threshold for shake detection
+    private static final int SHAKE_TIMEOUT = 1000; // Minimum time between shake events (ms)
 
     private Listener listener;
     private SensorManager sensorManager;
@@ -34,7 +34,7 @@ public class ShakeDetector implements SensorEventListener {
         this.accelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
 
         if (accelerometer != null) {
-            sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
+            sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_UI);
         }
     }
 

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -1229,7 +1229,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
 
         let previewFallbackBundle = self.implementation.getPreviewFallbackBundle()
-        self.endPreviewSession()
+        self.endPreviewSession(keepPreviewGuard: true)
         let restoredNextBundle = self.implementation.getNextBundle()
         self.deletePreviewBundleIfUnused(previewBundle, previewFallbackBundle: previewFallbackBundle, restoredNextBundle: restoredNextBundle)
         return true
@@ -1382,9 +1382,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private func endPreviewSession(keepPreviewGuard: Bool = false) {
         let previousShakeMenuEnabled = UserDefaults.standard.object(forKey: self.previewPreviousShakeMenuDefaultsKey) as? Bool
-            ?? getConfig().getBoolean("shakeMenu", false)
+            ?? self.getBooleanConfig("shakeMenu", defaultValue: false)
         let previousShakeChannelSelectorEnabled = UserDefaults.standard.object(forKey: self.previewPreviousShakeChannelSelectorDefaultsKey) as? Bool
-            ?? getConfig().getBoolean("allowShakeChannelSelector", false)
+            ?? self.getBooleanConfig("allowShakeChannelSelector", defaultValue: false)
         self.restorePreviewPreviousNextBundle()
         self.restorePreviewPreviousAppId()
         self.restorePreviewPreviousDefaultChannel()
@@ -1419,11 +1419,25 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.isLeavingPreviewForIncomingLink = false
         self.implementation.previewSession = false
         self.hidePreviewTransitionLoader(reason: "preview-session-disabled")
-        self.shakeMenuEnabled = getConfig().getBoolean("shakeMenu", false)
-        self.shakeChannelSelectorEnabled = getConfig().getBoolean("allowShakeChannelSelector", false)
+        self.shakeMenuEnabled = self.getBooleanConfig("shakeMenu", defaultValue: false)
+        self.shakeChannelSelectorEnabled = self.getBooleanConfig("allowShakeChannelSelector", defaultValue: false)
         self.clearPreviewSessionPreferences()
     }
 
+    private func getBooleanConfig(_ key: String, defaultValue: Bool) -> Bool {
+        guard self.bridge != nil else {
+            return defaultValue
+        }
+        return getConfig().getBoolean(key, defaultValue)
+    }
+
+    private func getStringConfig(_ key: String, defaultValue: String) -> String {
+        guard self.bridge != nil else {
+            return defaultValue
+        }
+        return getConfig().getString(key, defaultValue) ?? defaultValue
+    }
+
     private func clearPreviewSessionPreferences() {
         _ = self.implementation.setPreviewFallbackBundle(fallback: nil)
         UserDefaults.standard.removeObject(forKey: self.previewSessionDefaultsKey)
@@ -1449,7 +1463,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     private func restorePreviewPreviousDefaultChannel() {
-        let configDefaultChannel = self.getConfig().getString("defaultChannel", "")!
+        let configDefaultChannel = self.getStringConfig("defaultChannel", defaultValue: "")
         let hadPreviousDefaultChannel = UserDefaults.standard.object(forKey: self.previewPreviousDefaultChannelWasSetDefaultsKey) as? Bool ?? false
 
         guard hadPreviousDefaultChannel,
@@ -1636,8 +1650,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.previewSessionAlertPending = false
         self.isLeavingPreviewForIncomingLink = false
         self.implementation.previewSession = false
-        self.shakeMenuEnabled = getConfig().getBoolean("shakeMenu", false)
-        self.shakeChannelSelectorEnabled = getConfig().getBoolean("allowShakeChannelSelector", false)
+        self.shakeMenuEnabled = self.getBooleanConfig("shakeMenu", defaultValue: false)
+        self.shakeChannelSelectorEnabled = self.getBooleanConfig("allowShakeChannelSelector", defaultValue: false)
         self.restorePreviewPreviousAppId()
         self.restorePreviewPreviousDefaultChannel()
         _ = self.implementation.setPreviewFallbackBundle(fallback: nil)

package/ios/Sources/CapacitorUpdaterPlugin/ShakeMenu.swift

@@ -7,6 +7,9 @@
 import UIKit
 import Capacitor
 
+private var lastShakeMenuShownAt: TimeInterval = 0
+private let shakeMenuCooldownSeconds: TimeInterval = 1.2
+
 extension UIApplication {
     // swiftlint:disable:next line_length
     public class func topViewController(_ base: UIViewController? = UIApplication.shared.windows.first?.rootViewController) -> UIViewController? {
@@ -43,25 +46,38 @@ extension UIWindow {
                 return
             }
 
+            let now = Date().timeIntervalSince1970
+            guard now - lastShakeMenuShownAt >= shakeMenuCooldownSeconds else {
+                plugin.logger.info("Shake menu ignored because cooldown is active")
+                return
+            }
+
             if canShowPreviewMenu {
-                showDefaultMenu(plugin: plugin, bridge: bridge)
+                if showDefaultMenu(plugin: plugin, bridge: bridge) {
+                    lastShakeMenuShownAt = now
+                }
             } else {
-                showChannelSelector(plugin: plugin, bridge: bridge)
+                if showChannelSelector(plugin: plugin, bridge: bridge) {
+                    lastShakeMenuShownAt = now
+                }
             }
         }
     }
 
-    private func showDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
+    @discardableResult
+    private func showDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) -> Bool {
         // Prevent multiple alerts from showing
-        if let topVC = UIApplication.topViewController(),
-           topVC.isKind(of: UIAlertController.self) {
+        guard let topVC = UIApplication.topViewController() else {
+            return false
+        }
+        if topVC.isKind(of: UIAlertController.self) {
             plugin.logger.info("UIAlertController is already presented")
-            return
+            return false
         }
 
         guard plugin.hasActivePreviewSession() else {
             plugin.logger.info("Shake preview menu ignored because no preview session is active")
-            return
+            return false
         }
 
         let appName = Bundle.main.infoDictionary?["CFBundleDisplayName"] as? String ?? "App"
@@ -96,7 +112,7 @@ extension UIWindow {
         if plugin.shakeChannelSelectorEnabled {
             alertShake.addAction(UIAlertAction(title: "Switch channel", style: .default) { _ in
                 let showSelector = {
-                    self.showChannelSelector(plugin: plugin, bridge: bridge)
+                    _ = self.showChannelSelector(plugin: plugin, bridge: bridge)
                 }
 
                 if let presenter = alertShake.presentingViewController {
@@ -110,10 +126,9 @@ extension UIWindow {
         alertShake.addAction(UIAlertAction(title: cancelButtonTitle, style: .default))
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
-                topVC.present(alertShake, animated: true)
-            }
+            topVC.present(alertShake, animated: true)
         }
+        return true
     }
 
     private func showConfiguredDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
@@ -179,12 +194,15 @@ extension UIWindow {
         }
     }
 
-    private func showChannelSelector(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
+    @discardableResult
+    private func showChannelSelector(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) -> Bool {
         // Prevent multiple alerts from showing
-        if let topVC = UIApplication.topViewController(),
-           topVC.isKind(of: UIAlertController.self) {
+        guard let topVC = UIApplication.topViewController() else {
+            return false
+        }
+        if topVC.isKind(of: UIAlertController.self) {
             plugin.logger.info("UIAlertController is already presented")
-            return
+            return false
         }
 
         let updater = plugin.implementation
@@ -208,28 +226,27 @@ extension UIWindow {
         })
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
-                topVC.present(loadingAlert, animated: true) {
-                    // Fetch channels in background
-                    DispatchQueue.global(qos: .userInitiated).async {
-                        let result = updater.listChannels()
+            topVC.present(loadingAlert, animated: true) {
+                // Fetch channels in background
+                DispatchQueue.global(qos: .userInitiated).async {
+                    let result = updater.listChannels()
 
-                        DispatchQueue.main.async {
-                            loadingAlert.dismiss(animated: true) {
-                                guard !didCancel else { return }
-                                if !result.error.isEmpty {
-                                    self.showError(message: "Failed to load channels: \(result.error)", plugin: plugin)
-                                } else if result.channels.isEmpty {
-                                    self.showError(message: "No channels available for self-assignment", plugin: plugin)
-                                } else {
-                                    self.presentChannelPicker(channels: result.channels, plugin: plugin, bridge: bridge)
-                                }
+                    DispatchQueue.main.async {
+                        loadingAlert.dismiss(animated: true) {
+                            guard !didCancel else { return }
+                            if !result.error.isEmpty {
+                                self.showError(message: "Failed to load channels: \(result.error)", plugin: plugin)
+                            } else if result.channels.isEmpty {
+                                self.showError(message: "No channels available for self-assignment", plugin: plugin)
+                            } else {
+                                self.presentChannelPicker(channels: result.channels, plugin: plugin, bridge: bridge)
                             }
                         }
                     }
                 }
             }
         }
+        return true
     }
 
     private func presentChannelPicker(channels: [[String: Any]], plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "8.47.9",
+  "version": "8.47.10",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",