@capgo/capacitor-updater 7.6.0 → 7.7.0

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

@@ -60,7 +60,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String statsUrlDefault = "https://plugin.capgo.app/stats";
     private static final String channelUrlDefault = "https://plugin.capgo.app/channel_self";
 
-    private final String PLUGIN_VERSION = "7.6.0";
+    private final String PLUGIN_VERSION = "7.7.0";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -282,37 +282,41 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private void sendReadyToJs(final BundleInfo current, final String msg) {
-        logger.info("sendReadyToJs");
+        sendReadyToJs(current, msg, false);
+    }
+
+    private void sendReadyToJs(final BundleInfo current, final String msg, final boolean isDirectUpdate) {
+        logger.info("sendReadyToJs: " + msg);
         final JSObject ret = new JSObject();
         ret.put("bundle", mapToJSObject(current.toJSONMap()));
         ret.put("status", msg);
-        startNewThread(() -> {
-            logger.info("semaphoreReady sendReadyToJs");
-            semaphoreWait(CapacitorUpdaterPlugin.this.appReadyTimeout);
-            logger.info("semaphoreReady sendReadyToJs done");
-            CapacitorUpdaterPlugin.this.notifyListeners("appReady", ret);
-
-            // Auto hide splashscreen if enabled
-            if (CapacitorUpdaterPlugin.this.autoSplashscreen && CapacitorUpdaterPlugin.this.shouldUseDirectUpdate()) {
-                CapacitorUpdaterPlugin.this.hideSplashscreen();
-            }
-        });
+
+        // No need to wait for semaphore anymore since _reload() has already waited
+        this.notifyListeners("appReady", ret);
+
+        // Auto hide splashscreen if enabled and this is a direct update
+        if (this.autoSplashscreen && isDirectUpdate) {
+            this.hideSplashscreen();
+        }
     }
 
     private void hideSplashscreen() {
         try {
-            // Create a simple PluginCall for the hide method
-            PluginCall call = new PluginCall(
-                null, // MessageHandler - can be null for this use case
-                "hideSplashscreen",
-                "hide",
-                "autoHideSplashscreen",
-                new JSObject()
-            );
-
-            // Use bridge's callPluginMethod to call SplashScreen.hide()
-            getBridge().callPluginMethod("SplashScreen", "hide", call);
-            logger.info("Splashscreen hidden automatically via callPluginMethod");
+            // Use JavaScript evaluation to hide the splashscreen - simpler and more reliable
+            getBridge()
+                .getWebView()
+                .post(() -> {
+                    getBridge()
+                        .eval(
+                            "(function() { " +
+                            "  if (window.Capacitor && window.Capacitor.Plugins && window.Capacitor.Plugins.SplashScreen) { " +
+                            "    window.Capacitor.Plugins.SplashScreen.hide(); " +
+                            "  } " +
+                            "})()",
+                            null
+                        );
+                });
+            logger.info("Splashscreen hidden automatically via JavaScript");
         } catch (Exception e) {
             logger.error("Error hiding splashscreen: " + e.getMessage());
         }
@@ -354,7 +358,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private void directUpdateFinish(final BundleInfo latest) {
         CapacitorUpdaterPlugin.this.implementation.set(latest);
         CapacitorUpdaterPlugin.this._reload();
-        sendReadyToJs(latest, "update installed");
+        sendReadyToJs(latest, "update installed", true);
     }
 
     private void cleanupObsoleteVersions() {
@@ -766,6 +770,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
         this.checkAppReady();
         this.notifyListeners("appReloaded", new JSObject());
+
+        // Wait for the reload to complete (until notifyAppReady is called)
+        this.semaphoreWait(this.appReadyTimeout);
+
         return true;
     }
 
@@ -1104,6 +1112,16 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private void endBackGroundTaskWithNotif(String msg, String latestVersionName, BundleInfo current, Boolean error) {
+        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, false);
+    }
+
+    private void endBackGroundTaskWithNotif(
+        String msg,
+        String latestVersionName,
+        BundleInfo current,
+        Boolean error,
+        Boolean isDirectUpdate
+    ) {
         if (error) {
             logger.info(
                 "endBackGroundTaskWithNotif error: " +
@@ -1121,7 +1139,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         final JSObject ret = new JSObject();
         ret.put("bundle", mapToJSObject(current.toJSONMap()));
         this.notifyListeners("noNeedUpdate", ret);
-        this.sendReadyToJs(current, msg);
+        this.sendReadyToJs(current, msg, isDirectUpdate);
         this.backgroundDownloadTask = null;
         logger.info("endBackGroundTaskWithNotif " + msg);
     }
@@ -1146,7 +1164,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                     jsRes.getString("message"),
                                     current.getVersionName(),
                                     current,
-                                    true
+                                    true,
+                                    shouldDirectUpdate
                                 );
                             return;
                         }
@@ -1162,7 +1181,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                         "Updated to builtin version",
                                         latestVersionName,
                                         CapacitorUpdaterPlugin.this.implementation.getCurrentBundle(),
-                                        false
+                                        false,
+                                        true
                                     );
                             } else {
                                 logger.info("Setting next bundle to builtin");
@@ -1183,7 +1203,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                     "Error no url or wrong format",
                                     current.getVersionName(),
                                     current,
-                                    true
+                                    true,
+                                    shouldDirectUpdate
                                 );
                             return;
                         }
@@ -1201,7 +1222,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                             "Latest bundle already exists, and is in error state. Aborting update.",
                                             latestVersionName,
                                             current,
-                                            true
+                                            true,
+                                            shouldDirectUpdate
                                         );
                                     return;
                                 }
@@ -1218,7 +1240,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                                     "Update delayed until delay conditions met",
                                                     latestVersionName,
                                                     latest,
-                                                    false
+                                                    false,
+                                                    shouldDirectUpdate
                                                 );
                                             return;
                                         }
@@ -1228,7 +1251,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                                 "Update installed",
                                                 latestVersionName,
                                                 latest,
-                                                false
+                                                false,
+                                                true
                                             );
                                     } else {
                                         CapacitorUpdaterPlugin.this.notifyListeners("updateAvailable", ret);
@@ -1295,7 +1319,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                             "Error downloading file",
                                             latestVersionName,
                                             CapacitorUpdaterPlugin.this.implementation.getCurrentBundle(),
-                                            true
+                                            true,
+                                            shouldDirectUpdate
                                         );
                                 }
                             });
@@ -1309,7 +1334,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                 "Error parsing JSON",
                                 current.getVersionName(),
                                 current,
-                                true
+                                true,
+                                shouldDirectUpdate
                             );
                     }
                 });
@@ -1455,62 +1481,82 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
     @Override
     public void handleOnStart() {
-        if (isPreviousMainActivity) {
-            this.appMovedToForeground();
-        }
-        logger.info("onActivityStarted " + getActivity().getClass().getName());
-        isPreviousMainActivity = true;
+        try {
+            if (isPreviousMainActivity) {
+                this.appMovedToForeground();
+            }
+            logger.info("onActivityStarted " + getActivity().getClass().getName());
+            isPreviousMainActivity = true;
 
-        // 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());
+            // 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());
+                }
             }
+        } catch (Exception e) {
+            logger.error("Failed to run handleOnStart: " + e.getMessage());
         }
     }
 
     @Override
     public void handleOnStop() {
-        isPreviousMainActivity = isMainActivity();
-        if (isPreviousMainActivity) {
-            this.appMovedToBackground();
+        try {
+            isPreviousMainActivity = isMainActivity();
+            if (isPreviousMainActivity) {
+                this.appMovedToBackground();
+            }
+        } catch (Exception e) {
+            logger.error("Failed to run handleOnStop: " + e.getMessage());
         }
     }
 
     @Override
     public void handleOnResume() {
-        if (backgroundTask != null && taskRunning) {
-            backgroundTask.interrupt();
+        try {
+            if (backgroundTask != null && taskRunning) {
+                backgroundTask.interrupt();
+            }
+            this.implementation.activity = getActivity();
+        } catch (Exception e) {
+            logger.error("Failed to run handleOnResume: " + e.getMessage());
         }
-        this.implementation.activity = getActivity();
     }
 
     @Override
     public void handleOnPause() {
-        this.implementation.activity = getActivity();
+        try {
+            this.implementation.activity = getActivity();
+        } catch (Exception e) {
+            logger.error("Failed to run handleOnPause: " + e.getMessage());
+        }
     }
 
     @Override
     public void handleOnDestroy() {
-        logger.info("onActivityDestroyed " + getActivity().getClass().getName());
-        this.implementation.activity = getActivity();
-        counterActivityCreate--;
-        if (counterActivityCreate == 0) {
-            this.appKilled();
-        }
+        try {
+            logger.info("onActivityDestroyed " + getActivity().getClass().getName());
+            this.implementation.activity = getActivity();
+            counterActivityCreate--;
+            if (counterActivityCreate == 0) {
+                this.appKilled();
+            }
 
-        // Clean up shake menu
-        if (shakeMenu != null) {
-            try {
-                shakeMenu.stop();
-                shakeMenu = null;
-                logger.info("Shake menu cleaned up");
-            } catch (Exception e) {
-                logger.error("Failed to clean up shake menu: " + e.getMessage());
+            // Clean up shake menu
+            if (shakeMenu != null) {
+                try {
+                    shakeMenu.stop();
+                    shakeMenu = null;
+                    logger.info("Shake menu cleaned up");
+                } catch (Exception e) {
+                    logger.error("Failed to clean up shake menu: " + e.getMessage());
+                }
             }
+        } catch (Exception e) {
+            logger.error("Failed to run handleOnDestroy: " + e.getMessage());
         }
     }
 

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -50,7 +50,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let PLUGIN_VERSION: String = "7.6.0"
+    private let PLUGIN_VERSION: String = "7.7.0"
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
     static let channelUrlDefault = "https://plugin.capgo.app/channel_self"

package/package.json

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