@capgo/capacitor-updater 5.2.12 → 5.2.14

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

@@ -58,7 +58,7 @@ public class CapacitorUpdaterPlugin
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "5.2.12";
+  private final String PLUGIN_VERSION = "5.2.14";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -85,6 +85,16 @@ public class CapacitorUpdaterPlugin
   @Override
   public void load() {
     super.load();
+    new Thread(() -> {
+      try {
+        Log.i(CapacitorUpdater.TAG, "semaphoreReady load");
+        CapacitorUpdaterPlugin.this.semaphoreReady.await(0, TimeUnit.SECONDS);
+        Log.i(CapacitorUpdater.TAG, "semaphoreReady load done");
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+    })
+      .start();
     this.prefs =
       this.getContext()
         .getSharedPreferences(
@@ -184,13 +194,14 @@ public class CapacitorUpdaterPlugin
     ret.put("status", "update installed");
     CapacitorUpdaterPlugin.this.implementation.set(latest);
     CapacitorUpdaterPlugin.this._reload();
-    CapacitorUpdaterPlugin.this.notifyListeners("appReady", ret);
     new Thread(() -> {
       try {
+        Log.i(CapacitorUpdater.TAG, "semaphoreReady directUpdateFinish");
         CapacitorUpdaterPlugin.this.semaphoreReady.await(
             CapacitorUpdaterPlugin.this.appReadyTimeout,
             TimeUnit.SECONDS
           );
+        Log.i(CapacitorUpdater.TAG, "semaphoreReady directUpdateFinish done");
       } catch (InterruptedException e) {
         e.printStackTrace();
       }
@@ -456,7 +467,16 @@ public class CapacitorUpdaterPlugin
 
   private boolean _reload() {
     final String path = this.implementation.getCurrentBundlePath();
-    this.semaphoreReady.countDown();
+    new Thread(() -> {
+      try {
+        Log.i(CapacitorUpdater.TAG, "semaphoreReady _reload");
+        CapacitorUpdaterPlugin.this.semaphoreReady.await(0, TimeUnit.SECONDS);
+        Log.i(CapacitorUpdater.TAG, "semaphoreReady _reload done");
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+    })
+      .start();
     Log.i(CapacitorUpdater.TAG, "Reloading: " + path);
     if (this.implementation.isUsingBuiltin()) {
       this.bridge.setServerAssetPath(path);
@@ -674,7 +694,9 @@ public class CapacitorUpdaterPlugin
         "Current bundle loaded successfully. ['notifyAppReady()' was called] " +
         bundle
       );
+      Log.i(CapacitorUpdater.TAG, "semaphoreReady countDown");
       this.semaphoreReady.countDown();
+      Log.i(CapacitorUpdater.TAG, "semaphoreReady countDown done");
       call.resolve();
     } catch (final Exception e) {
       Log.e(
@@ -885,7 +907,26 @@ public class CapacitorUpdaterPlugin
     ret.put("bundle", current.toJSON());
     this.notifyListeners("noNeedUpdate", ret);
     ret.put("message", msg);
-    this.notifyListeners("appReady", ret);
+    new Thread(() -> {
+      try {
+        Log.i(
+          CapacitorUpdater.TAG,
+          "semaphoreReady endBackGroundTaskWithNotif"
+        );
+        CapacitorUpdaterPlugin.this.semaphoreReady.await(
+            CapacitorUpdaterPlugin.this.appReadyTimeout,
+            TimeUnit.SECONDS
+          );
+        Log.i(
+          CapacitorUpdater.TAG,
+          "semaphoreReady endBackGroundTaskWithNotif done"
+        );
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+      CapacitorUpdaterPlugin.this.notifyListeners("appReady", ret);
+    })
+      .start();
     Log.i(CapacitorUpdater.TAG, "endBackGroundTaskWithNotif " + msg);
   }
 
@@ -1257,10 +1298,12 @@ public class CapacitorUpdaterPlugin
       Log.i(CapacitorUpdater.TAG, "Auto update is disabled");
       new Thread(() -> {
         try {
+          Log.i(CapacitorUpdater.TAG, "semaphoreReady Auto update");
           CapacitorUpdaterPlugin.this.semaphoreReady.await(
               CapacitorUpdaterPlugin.this.appReadyTimeout,
               TimeUnit.SECONDS
             );
+          Log.i(CapacitorUpdater.TAG, "semaphoreReady Auto update done");
         } catch (InterruptedException e) {
           e.printStackTrace();
         }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -15,7 +15,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     private var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "5.2.12"
+    private let PLUGIN_VERSION: String = "5.2.14"
     static let updateUrlDefault = "https://api.capgo.app/updates"
     static let statsUrlDefault = "https://api.capgo.app/stats"
     static let channelUrlDefault = "https://api.capgo.app/channel_self"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "5.2.12",
+  "version": "5.2.14",
   "packageManager": "pnpm@8.6.12",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",