@capgo/capacitor-updater 8.47.6 → 8.47.8

package/README.md

@@ -323,8 +323,8 @@ CapacitorUpdater can be configured with these options:
 | **`keepUrlPathAfterReload`**    | <code>boolean</code>                                                                                       | Configure the plugin to keep the URL path after a reload. WARNING: When a reload is triggered, 'window.history' will be cleared.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | <code>false</code>                                                            | 6.8.0   |
 | **`disableJSLogging`**          | <code>boolean</code>                                                                                       | Disable the JavaScript logging of the plugin. if true, the plugin will not log to the JavaScript console. only the native log will be done                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | <code>false</code>                                                            | 7.3.0   |
 | **`osLogging`**                 | <code>boolean</code>                                                                                       | Enable OS-level logging. When enabled, logs are written to the system log which can be inspected in production builds. - **iOS**: Uses os_log instead of Swift.print, logs accessible via Console.app or Instruments - **Android**: Logs to Logcat (android.util.Log) When set to false, system logging is disabled on both platforms (only JavaScript console logging will occur if enabled). This is useful for debugging production apps (App Store/TestFlight builds on iOS, or production APKs on Android).                                                                                                                                                                                                                                                                                                                                                                                                       | <code>true</code>                                                             | 8.42.0  |
-| **`shakeMenu`**                 | <code>boolean</code>                                                                                       | Enable shake gesture to show update menu for debugging/testing purposes                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | <code>false</code>                                                            | 7.5.0   |
-| **`allowShakeChannelSelector`** | <code>boolean</code>                                                                                       | Enable the shake gesture to show a channel selector menu for switching between update channels. When enabled AND `shakeMenu` is true, the shake gesture shows a channel selector instead of the default debug menu (Go Home/Reload/Close). After selecting a channel, the app automatically checks for updates and downloads if available. Only works if channels have `allow_self_set` enabled on the backend. Only available for Android and iOS.                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | <code>false</code>                                                            | 8.43.0  |
+| **`shakeMenu`**                 | <code>boolean</code>                                                                                       | Enable the shake gesture while a preview session is active. Outside preview sessions this preview menu is ignored, unless {@link PluginsConfig.CapacitorUpdater.allowShakeChannelSelector} is enabled.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | <code>false</code>                                                            | 7.5.0   |
+| **`allowShakeChannelSelector`** | <code>boolean</code>                                                                                       | Enable the shake gesture to show a channel selector menu for switching between update channels. If {@link PluginsConfig.CapacitorUpdater.shakeMenu} is also enabled while a preview session is active, the shake menu includes both preview actions and channel switching. Only available for Android and iOS.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | <code>false</code>                                                            | 8.43.0  |
 
 ### Examples
 
@@ -1818,19 +1818,15 @@ Use this to:
 setShakeMenu(options: SetShakeMenuOptions) => Promise<void>
 ```
 
-Enable or disable the shake gesture menu for debugging and testing.
+Enable or disable the shake gesture menu.
 
-When enabled, users can shake their device to open a debug menu that shows:
-- Current bundle information
-- Available bundles
-- Options to switch bundles manually
-- Update status
+During preview sessions, users can shake their device to:
+- Reload the current preview
+- Leave the test app and return to the fallback bundle
+- Switch update channel, when {@link PluginsConfig.CapacitorUpdater.allowShakeChannelSelector} is also enabled
 
-This is useful during development and testing to:
-- Quickly test different bundle versions
-- Debug update flows
-- Switch between production and test bundles
-- Verify bundle installations
+Outside preview sessions, this preview menu is ignored. The channel selector can still be
+shown outside preview sessions when {@link PluginsConfig.CapacitorUpdater.allowShakeChannelSelector} is enabled.
 
 **Important:** Disable this in production builds or only enable for internal testers.
 
@@ -1876,12 +1872,9 @@ setShakeChannelSelector(options: SetShakeChannelSelectorOptions) => Promise<void
 
 Enable or disable the shake channel selector at runtime.
 
-When enabled AND shakeMenu is true, shaking the device shows a channel
-selector instead of the debug menu. This allows users to switch between
-update channels by shaking their device.
-
-After selecting a channel, the app automatically checks for updates
-and downloads if available.
+When enabled, shaking the device can show a channel selector, including outside preview sessions.
+If {@link setShakeMenu} is also enabled while a preview session is active, the shake menu includes
+both preview actions and channel switching.
 
 Can also be configured via {@link PluginsConfig.CapacitorUpdater.allowShakeChannelSelector}.
 
@@ -2386,7 +2379,7 @@ Result returned after requesting an immediate native auto-update check.
 
 | Prop                 | Type                 | Description                                     | Since |
 | -------------------- | -------------------- | ----------------------------------------------- | ----- |
-| **`id`**             | <code>string</code>  | The channel ID                                  | 7.5.0 |
+| **`id`**             | <code>number</code>  | The channel ID                                  | 7.5.0 |
 | **`name`**           | <code>string</code>  | The channel name                                | 7.5.0 |
 | **`public`**         | <code>boolean</code> | Whether this is a public channel                | 7.5.0 |
 | **`allow_self_set`** | <code>boolean</code> | Whether devices can self-assign to this channel | 7.5.0 |

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

@@ -115,6 +115,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final int SPLASH_SCREEN_RETRY_DELAY_MS = 100;
     private static final int SPLASH_SCREEN_MAX_RETRIES = 20;
     private static final long PENDING_BUNDLE_APP_READY_MIN_TIMEOUT_MS = 30000L;
+    private static final long PREVIEW_TRANSITION_LOADER_TIMEOUT_MS = 60000L;
     static final int APPLICATION_EXIT_REASON_UNKNOWN = 0;
     static final int APPLICATION_EXIT_REASON_EXIT_SELF = 1;
     static final int APPLICATION_EXIT_REASON_SIGNALED = 2;
@@ -128,7 +129,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.47.6";
+    private final String pluginVersion = "8.47.8";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -222,6 +223,9 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private final Handler mainHandler = new Handler(Looper.getMainLooper());
     private FrameLayout splashscreenLoaderOverlay;
     private Runnable splashscreenTimeoutRunnable;
+    private FrameLayout previewTransitionLoaderOverlay;
+    private Runnable previewTransitionLoaderTimeoutRunnable;
+    private boolean previewTransitionLoaderRequested = false;
     private WebViewListener webViewStatsListener;
 
     private static final class FireAndForgetPluginCall extends PluginCall {
@@ -537,7 +541,9 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 logger.info("Using preview appId " + previewAppId);
             }
             this.shakeMenuEnabled = true;
-            this.shakeChannelSelectorEnabled = false;
+            this.shakeChannelSelectorEnabled = this.prefs.contains(PREVIEW_PREVIOUS_SHAKE_CHANNEL_SELECTOR_PREF_KEY)
+                ? this.prefs.getBoolean(PREVIEW_PREVIOUS_SHAKE_CHANNEL_SELECTOR_PREF_KEY, false)
+                : this.shakeChannelSelectorEnabled;
         }
         boolean resetWhenUpdate = this.getConfig().getBoolean("resetWhenUpdate", true);
 
@@ -682,6 +688,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         if (this.autoSplashscreen) {
             this.hideSplashscreen();
         }
+        this.hidePreviewTransitionLoader("app-ready");
     }
 
     private void hideSplashscreen() {
@@ -793,6 +800,38 @@ public class CapacitorUpdaterPlugin extends Plugin {
         return requestToken == this.splashscreenInvocationToken;
     }
 
+    private FrameLayout createLoaderOverlay(final Activity activity, final boolean blocksTouches, final int backgroundColor) {
+        final ProgressBar progressBar = new ProgressBar(activity);
+        progressBar.setIndeterminate(true);
+
+        final FrameLayout overlay = new FrameLayout(activity);
+        overlay.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        overlay.setClickable(blocksTouches);
+        overlay.setFocusable(blocksTouches);
+        overlay.setBackgroundColor(backgroundColor);
+        overlay.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
+
+        final FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+            ViewGroup.LayoutParams.WRAP_CONTENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        );
+        params.gravity = Gravity.CENTER;
+        overlay.addView(progressBar, params);
+        return overlay;
+    }
+
+    private void attachLoaderOverlay(final Activity activity, final FrameLayout overlay) {
+        final ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
+        decorView.addView(overlay);
+    }
+
+    private void removeLoaderOverlay(final FrameLayout overlay) {
+        final ViewGroup parent = (ViewGroup) overlay.getParent();
+        if (parent != null) {
+            parent.removeView(overlay);
+        }
+    }
+
     private void addSplashscreenLoaderIfNeeded() {
         if (!Boolean.TRUE.equals(this.autoSplashscreenLoader)) {
             return;
@@ -809,26 +848,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 return;
             }
 
-            ProgressBar progressBar = new ProgressBar(activity);
-            progressBar.setIndeterminate(true);
-
-            FrameLayout overlay = new FrameLayout(activity);
-            overlay.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-            overlay.setClickable(false);
-            overlay.setFocusable(false);
-            overlay.setBackgroundColor(Color.TRANSPARENT);
-            overlay.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-
-            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-            );
-            params.gravity = Gravity.CENTER;
-            overlay.addView(progressBar, params);
-
-            ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
-            decorView.addView(overlay);
-
+            FrameLayout overlay = createLoaderOverlay(activity, false, Color.TRANSPARENT);
+            attachLoaderOverlay(activity, overlay);
             this.splashscreenLoaderOverlay = overlay;
         };
 
@@ -842,10 +863,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private void removeSplashscreenLoader() {
         Runnable removeLoader = () -> {
             if (this.splashscreenLoaderOverlay != null) {
-                ViewGroup parent = (ViewGroup) this.splashscreenLoaderOverlay.getParent();
-                if (parent != null) {
-                    parent.removeView(this.splashscreenLoaderOverlay);
-                }
+                removeLoaderOverlay(this.splashscreenLoaderOverlay);
                 this.splashscreenLoaderOverlay = null;
             }
         };
@@ -857,6 +875,84 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
     }
 
+    private void showPreviewTransitionLoader(final String reason) {
+        this.previewTransitionLoaderRequested = true;
+        final Runnable showLoader = () -> {
+            if (!this.previewTransitionLoaderRequested) {
+                return;
+            }
+
+            if (this.previewTransitionLoaderOverlay != null) {
+                cancelPreviewTransitionLoaderTimeout();
+                schedulePreviewTransitionLoaderTimeout();
+                this.previewTransitionLoaderOverlay.bringToFront();
+                return;
+            }
+
+            final Activity activity = getActivity();
+            if (activity == null) {
+                logger.warn("Preview transition loader unavailable: activity missing for " + reason);
+                this.previewTransitionLoaderRequested = false;
+                return;
+            }
+
+            cancelPreviewTransitionLoaderTimeout();
+            schedulePreviewTransitionLoaderTimeout();
+
+            final FrameLayout overlay = createLoaderOverlay(activity, true, Color.argb(46, 0, 0, 0));
+            attachLoaderOverlay(activity, overlay);
+            this.previewTransitionLoaderOverlay = overlay;
+            logger.info("Preview transition loader shown: " + reason);
+        };
+
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            showLoader.run();
+        } else {
+            this.mainHandler.post(showLoader);
+        }
+    }
+
+    private void hidePreviewTransitionLoader(final String reason) {
+        if (
+            !this.previewTransitionLoaderRequested &&
+            this.previewTransitionLoaderOverlay == null &&
+            this.previewTransitionLoaderTimeoutRunnable == null
+        ) {
+            return;
+        }
+
+        final Runnable hideLoader = () -> {
+            this.previewTransitionLoaderRequested = false;
+            cancelPreviewTransitionLoaderTimeout();
+            if (this.previewTransitionLoaderOverlay == null) {
+                return;
+            }
+
+            removeLoaderOverlay(this.previewTransitionLoaderOverlay);
+            this.previewTransitionLoaderOverlay = null;
+            logger.info("Preview transition loader hidden: " + reason);
+        };
+
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            hideLoader.run();
+        } else {
+            this.mainHandler.post(hideLoader);
+        }
+    }
+
+    private void schedulePreviewTransitionLoaderTimeout() {
+        cancelPreviewTransitionLoaderTimeout();
+        this.previewTransitionLoaderTimeoutRunnable = () -> hidePreviewTransitionLoader("preview-transition-timeout");
+        this.mainHandler.postDelayed(this.previewTransitionLoaderTimeoutRunnable, PREVIEW_TRANSITION_LOADER_TIMEOUT_MS);
+    }
+
+    private void cancelPreviewTransitionLoaderTimeout() {
+        if (this.previewTransitionLoaderTimeoutRunnable != null) {
+            this.mainHandler.removeCallbacks(this.previewTransitionLoaderTimeoutRunnable);
+            this.previewTransitionLoaderTimeoutRunnable = null;
+        }
+    }
+
     private void scheduleSplashscreenTimeout() {
         if (this.autoSplashscreenTimeout == null || this.autoSplashscreenTimeout <= 0) {
             return;
@@ -2325,6 +2421,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     @PluginMethod
     public void startPreviewSession(final PluginCall call) {
         if (!Boolean.TRUE.equals(this.allowPreview)) {
+            this.hidePreviewTransitionLoader("preview-session-not-allowed");
             logger.error("startPreviewSession not allowed set allowPreview in your config to true to enable it");
             call.reject("startPreviewSession not allowed");
             return;
@@ -2333,6 +2430,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         final String rawPayloadUrl = call.getString("payloadUrl");
         final String previewPayloadUrl = this.normalizePreviewPayloadUrl(rawPayloadUrl);
         if (this.hasPreviewPayloadUrl(rawPayloadUrl) && previewPayloadUrl == null) {
+            this.hidePreviewTransitionLoader("preview-session-invalid-payload");
             logger.error("startPreviewSession called with invalid payloadUrl");
             call.reject("Invalid preview payloadUrl");
             return;
@@ -2342,6 +2440,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 if (!Boolean.TRUE.equals(this.previewSessionEnabled)) {
                     final BundleInfo current = this.implementation.getCurrentBundle();
                     if (!this.implementation.setPreviewFallbackBundle(current.getId())) {
+                        this.hidePreviewTransitionLoader("preview-session-fallback-failed");
                         logger.error("Could not save current bundle as preview fallback");
                         call.reject("Could not save current bundle as preview fallback");
                         return;
@@ -2386,17 +2485,18 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     this.editor.remove(PREVIEW_PAYLOAD_URL_PREF_KEY);
                 }
 
+                this.hidePreviewTransitionLoader("preview-session-started");
                 this.previewSessionEnabled = true;
                 this.previewSessionAlertPending = true;
                 this.implementation.previewSession = true;
                 this.shakeMenuEnabled = true;
-                this.shakeChannelSelectorEnabled = false;
                 this.editor.putBoolean(PREVIEW_SESSION_PREF_KEY, true);
                 this.editor.putBoolean(PREVIEW_SESSION_ALERT_PENDING_PREF_KEY, true);
                 this.editor.apply();
                 this.ensureShakeMenuStarted();
                 call.resolve();
             } catch (final Exception e) {
+                this.hidePreviewTransitionLoader("preview-session-failed");
                 logger.error("Could not start preview session " + e.getMessage());
                 call.reject("Could not start preview session", e);
             }
@@ -2406,8 +2506,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
     public boolean leavePreviewSessionFromShakeMenu() {
         final BundleInfo previewBundle = this.implementation.getCurrentBundle();
 
+        this.showPreviewTransitionLoader("leave-preview-session");
         final boolean didReset = this.resetToPreviewFallbackBundle();
         if (!didReset) {
+            this.hidePreviewTransitionLoader("leave-preview-session-failed");
             return false;
         }
 
@@ -2419,8 +2521,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private boolean leavePreviewSessionForIncomingPreviewLink() {
+        this.showPreviewTransitionLoader("incoming-preview-deeplink");
         final BundleInfo previewBundle = this.implementation.getCurrentBundle();
         final BundleInfo previewFallbackBundle = this.implementation.getPreviewFallbackBundle();
+        boolean didReload = false;
 
         try {
             if (previewFallbackBundle == null || previewFallbackBundle.isErrorStatus()) {
@@ -2443,6 +2547,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 this.restoreLiveBundleStateAfterFailedReload();
                 return false;
             }
+            didReload = true;
 
             this.endPreviewSession(true);
             final BundleInfo restoredNextBundle = this.implementation.getNextBundle();
@@ -2450,6 +2555,9 @@ public class CapacitorUpdaterPlugin extends Plugin {
             return true;
         } finally {
             this.clearIncomingPreviewTransition();
+            if (!didReload) {
+                this.hidePreviewTransitionLoader("incoming-preview-deeplink-failed");
+            }
         }
     }
 
@@ -2467,10 +2575,12 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
 
         this.isLeavingPreviewForIncomingLink = true;
+        this.showPreviewTransitionLoader("preview-launch-deeplink");
         logger.info("Preview deeplink launch detected while preview session is active; restoring fallback before initial load");
         if (!this.leavePreviewSessionWithoutReload()) {
             logger.error("Could not leave preview session before initial preview deeplink routing");
             this.isLeavingPreviewForIncomingLink = false;
+            this.hidePreviewTransitionLoader("preview-launch-deeplink-failed");
         }
     }
 
@@ -2519,12 +2629,19 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     public boolean reloadPreviewSessionFromShakeMenu() {
+        this.showPreviewTransitionLoader("reload-preview-session");
+        final boolean didReload;
         final String payloadUrl = this.storedPreviewPayloadUrl();
         if (payloadUrl != null) {
-            return this.refreshPreviewSessionFromPayloadUrl(payloadUrl);
+            didReload = this.refreshPreviewSessionFromPayloadUrl(payloadUrl);
+        } else {
+            didReload = this.reloadWithoutWaitingForAppReady();
         }
 
-        return this.reloadWithoutWaitingForAppReady();
+        if (!didReload) {
+            this.hidePreviewTransitionLoader("reload-preview-session-failed");
+        }
+        return didReload;
     }
 
     public boolean hasActivePreviewSession() {
@@ -2581,6 +2698,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
         this.shakeMenuEnabled = previousShakeMenuEnabled;
         this.shakeChannelSelectorEnabled = previousShakeChannelSelectorEnabled;
+        this.syncShakeMenuLifecycle();
         this.implementation.setPreviewFallbackBundle(null);
         this.clearPreviewSessionPreferences();
         logger.info("Preview session ended");
@@ -2605,8 +2723,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
         this.previewSessionAlertPending = false;
         this.isLeavingPreviewForIncomingLink = false;
         this.implementation.previewSession = false;
+        this.hidePreviewTransitionLoader("preview-session-disabled");
         this.shakeMenuEnabled = this.getConfig().getBoolean("shakeMenu", false);
         this.shakeChannelSelectorEnabled = this.getConfig().getBoolean("allowShakeChannelSelector", false);
+        this.syncShakeMenuLifecycle();
         this.clearPreviewSessionPreferences();
     }
 
@@ -2829,6 +2949,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         this.implementation.previewSession = false;
         this.shakeMenuEnabled = this.getConfig().getBoolean("shakeMenu", false);
         this.shakeChannelSelectorEnabled = this.getConfig().getBoolean("allowShakeChannelSelector", false);
+        this.syncShakeMenuLifecycle();
         this.restorePreviewPreviousAppId();
         this.restorePreviewPreviousDefaultChannel();
         this.implementation.setPreviewFallbackBundle(null);
@@ -2859,6 +2980,24 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
     }
 
+    private void syncShakeMenuLifecycle() {
+        if (this.shouldListenForShake()) {
+            this.ensureShakeMenuStarted();
+        } else if (shakeMenu != null) {
+            try {
+                shakeMenu.stop();
+                shakeMenu = null;
+                logger.info("Shake menu stopped");
+            } catch (Exception e) {
+                logger.error("Failed to stop shake menu: " + e.getMessage());
+            }
+        }
+    }
+
+    private boolean shouldListenForShake() {
+        return Boolean.TRUE.equals(this.shakeMenuEnabled) || Boolean.TRUE.equals(this.shakeChannelSelectorEnabled);
+    }
+
     private void showPreviewSessionNoticeIfNeeded() {
         if (!Boolean.TRUE.equals(this.previewSessionEnabled) || !Boolean.TRUE.equals(this.previewSessionAlertPending)) {
             return;
@@ -3337,6 +3476,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             this.semaphoreDown();
             logger.info("semaphoreReady countDown done");
             this.clearIncomingPreviewTransition();
+            this.hidePreviewTransitionLoader("notify-app-ready");
             final JSObject ret = new JSObject();
             ret.put("bundle", InternalUtils.mapToJSObject(bundle.toJSONMap()));
             call.resolve(ret);
@@ -4185,6 +4325,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
 
         this.isLeavingPreviewForIncomingLink = true;
+        this.showPreviewTransitionLoader("incoming-preview-deeplink");
         if (getActivity() != null) {
             getActivity().setIntent(intent);
         }
@@ -4194,6 +4335,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             if (!didLeave) {
                 logger.error("Could not leave preview session before routing incoming preview deeplink");
                 this.isLeavingPreviewForIncomingLink = false;
+                this.hidePreviewTransitionLoader("incoming-preview-deeplink-failed");
             }
         });
     }
@@ -4214,13 +4356,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
             }
 
             // Initialize shake menu if enabled and activity is BridgeActivity
-            if (shakeMenuEnabled && getActivity() instanceof com.getcapacitor.BridgeActivity && shakeMenu == null) {
-                try {
-                    shakeMenu = new ShakeMenu(this, (com.getcapacitor.BridgeActivity) getActivity(), logger);
-                    logger.info("Shake menu initialized");
-                } catch (Exception e) {
-                    logger.error("Failed to initialize shake menu: " + e.getMessage());
-                }
+            if (this.shouldListenForShake()) {
+                this.ensureShakeMenuStarted();
             }
         } catch (Exception e) {
             logger.error("Failed to run handleOnStart: " + e.getMessage());
@@ -4279,23 +4416,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         this.shakeMenuEnabled = enabled;
         logger.info("Shake menu " + (enabled ? "enabled" : "disabled"));
 
-        // Manage shake menu instance based on enabled state
-        if (enabled && getActivity() instanceof com.getcapacitor.BridgeActivity && shakeMenu == null) {
-            try {
-                shakeMenu = new ShakeMenu(this, (com.getcapacitor.BridgeActivity) getActivity(), logger);
-                logger.info("Shake menu initialized");
-            } catch (Exception e) {
-                logger.error("Failed to initialize shake menu: " + e.getMessage());
-            }
-        } else if (!enabled && shakeMenu != null) {
-            try {
-                shakeMenu.stop();
-                shakeMenu = null;
-                logger.info("Shake menu stopped");
-            } catch (Exception e) {
-                logger.error("Failed to stop shake menu: " + e.getMessage());
-            }
-        }
+        this.syncShakeMenuLifecycle();
 
         call.resolve();
     }
@@ -4323,6 +4444,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
         this.shakeChannelSelectorEnabled = enabled;
         logger.info("Shake channel selector " + (enabled ? "enabled" : "disabled"));
+        this.syncShakeMenuLifecycle();
         call.resolve();
     }
 

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

@@ -1903,59 +1903,38 @@ public class CapgoUpdater {
                         String data = responseBody.string();
 
                         try {
-                            Map<String, Object> ret = new HashMap<>();
+                            Map<String, Object> ret = parseListChannelsResponse(data);
 
+                            logger.info("Channels listed successfully");
+                            callback.callback(ret);
+                        } catch (JSONException arrayException) {
+                            // If not an array, try to parse as error object
                             try {
-                                // Try to parse as direct array first
-                                JSONArray channelsJson = new JSONArray(data);
-                                List<Map<String, Object>> channelsList = new ArrayList<>();
-
-                                for (int i = 0; i < channelsJson.length(); i++) {
-                                    JSONObject channelJson = channelsJson.getJSONObject(i);
-                                    Map<String, Object> channel = new HashMap<>();
-                                    channel.put("id", channelJson.optString("id", ""));
-                                    channel.put("name", channelJson.optString("name", ""));
-                                    channel.put("public", channelJson.optBoolean("public", false));
-                                    channel.put("allow_self_set", channelJson.optBoolean("allow_self_set", false));
-                                    channelsList.add(channel);
-                                }
-
-                                // Wrap in channels object for JS API
-                                ret.put("channels", channelsList);
-
-                                logger.info("Channels listed successfully");
-                                callback.callback(ret);
-                            } catch (JSONException arrayException) {
-                                // If not an array, try to parse as error object
-                                try {
-                                    JSONObject json = new JSONObject(data);
-                                    if (json.has("error")) {
-                                        Map<String, Object> retError = new HashMap<>();
-                                        retError.put("error", json.getString("error"));
-                                        if (json.has("message")) {
-                                            retError.put("message", json.getString("message"));
-                                        } else {
-                                            retError.put("message", "server did not provide a message");
-                                        }
-                                        callback.callback(retError);
-                                        return;
-                                    }
+                                JSONObject json = new JSONObject(data);
+                                if (json.has("error")) {
                                     Map<String, Object> retError = new HashMap<>();
-                                    retError.put("message", "Unexpected channels response format");
-                                    retError.put("error", "parse_error");
+                                    retError.put("error", json.getString("error"));
+                                    if (json.has("message")) {
+                                        retError.put("message", json.getString("message"));
+                                    } else {
+                                        retError.put("message", "server did not provide a message");
+                                    }
                                     callback.callback(retError);
                                     return;
-                                } catch (JSONException objException) {
-                                    // If neither array nor object, throw parse error
-                                    arrayException.addSuppressed(objException);
-                                    throw arrayException;
                                 }
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", "Unexpected channels response format");
+                                retError.put("error", "parse_error");
+                                callback.callback(retError);
+                                return;
+                            } catch (JSONException objException) {
+                                // If neither array nor object, throw parse error
+                                arrayException.addSuppressed(objException);
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", "JSON parse error: " + arrayException.getMessage());
+                                retError.put("error", "parse_error");
+                                callback.callback(retError);
                             }
-                        } catch (JSONException e) {
-                            Map<String, Object> retError = new HashMap<>();
-                            retError.put("message", "JSON parse error: " + e.getMessage());
-                            retError.put("error", "parse_error");
-                            callback.callback(retError);
                         }
                     }
                 }
@@ -1963,6 +1942,29 @@ public class CapgoUpdater {
         );
     }
 
+    static Map<String, Object> parseListChannelsResponse(final String data) throws JSONException {
+        JSONArray channelsJson = new JSONArray(data);
+        List<Map<String, Object>> channelsList = new ArrayList<>();
+
+        for (int i = 0; i < channelsJson.length(); i++) {
+            JSONObject channelJson = channelsJson.getJSONObject(i);
+            Object channelId = channelJson.get("id");
+            if (!(channelId instanceof Number)) {
+                throw new JSONException("Channel id must be a number");
+            }
+            Map<String, Object> channel = new HashMap<>();
+            channel.put("id", channelId);
+            channel.put("name", channelJson.optString("name", ""));
+            channel.put("public", channelJson.optBoolean("public", false));
+            channel.put("allow_self_set", channelJson.optBoolean("allow_self_set", false));
+            channelsList.add(channel);
+        }
+
+        Map<String, Object> ret = new HashMap<>();
+        ret.put("channels", channelsList);
+        return ret;
+    }
+
     public void sendStats(final String action) {
         this.sendStats(action, this.getCurrentBundle().getVersionName());
     }