@capgo/capacitor-updater 5.2.2 → 5.2.4

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

@@ -78,6 +78,7 @@ public class CapacitorUpdater {
   public RequestQueue requestQueue;
 
   public File documentsDir;
+  public Boolean directUpdate = false;
   public Activity activity;
   public String PLUGIN_VERSION = "";
   public String versionBuild = "";
@@ -369,7 +370,11 @@ public class CapacitorUpdater {
       ret.put("bundle", next.toJSON());
       CapacitorUpdater.this.notifyListeners("updateAvailable", ret);
       if (setNext) {
-        this.setNextBundle(next.getId());
+        if (this.directUpdate) {
+          this.set(next);
+        } else {
+          this.setNextBundle(next.getId());
+        }
       }
     } catch (IOException e) {
       e.printStackTrace();

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

@@ -55,7 +55,7 @@ public class CapacitorUpdaterPlugin
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "5.2.2";
+  private final String PLUGIN_VERSION = "5.2.4";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -72,7 +72,6 @@ public class CapacitorUpdaterPlugin
   private Boolean resetWhenUpdate = true;
   private Thread backgroundTask;
   private Boolean taskRunning = false;
-  private Boolean directUpdate = false;
 
   private Boolean isPreviousMainActivity = true;
 
@@ -113,7 +112,8 @@ public class CapacitorUpdaterPlugin
       this.implementation.versionCode = Integer.toString(pInfo.versionCode);
       this.implementation.requestQueue =
         Volley.newRequestQueue(this.getContext());
-      this.directUpdate = this.getConfig().getBoolean("directUpdate", false);
+      this.implementation.directUpdate =
+        this.getConfig().getBoolean("directUpdate", false);
       this.currentVersionNative =
         new Version(this.getConfig().getString("version", pInfo.versionName));
     } catch (final PackageManager.NameNotFoundException e) {
@@ -837,6 +837,9 @@ public class CapacitorUpdaterPlugin
   }
 
   private void backgroundDownload() {
+    String messageUpdate = this.implementation.directUpdate
+      ? "Update will occur now."
+      : "Update will occur next time app moves to background.";
     new Thread(
       new Runnable() {
         @Override
@@ -919,9 +922,12 @@ public class CapacitorUpdaterPlugin
                       if (latest.isDownloaded()) {
                         Log.i(
                           CapacitorUpdater.TAG,
-                          "Latest bundle already exists and download is NOT required. Update will occur next time app moves to background."
+                          "Latest bundle already exists and download is NOT required. " +
+                          messageUpdate
                         );
-                        if (CapacitorUpdaterPlugin.this.directUpdate) {
+                        if (
+                          CapacitorUpdaterPlugin.this.implementation.directUpdate
+                        ) {
                           CapacitorUpdaterPlugin.this.implementation.set(
                               latest
                             );
@@ -985,7 +991,8 @@ public class CapacitorUpdaterPlugin
                               latestVersionName +
                               " found. Current is: " +
                               current.getVersionName() +
-                              ". Update will occur next time app moves to background."
+                              ". " +
+                              messageUpdate
                             );
 
                             final String url = res.getString("url");

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.2"
+    private let PLUGIN_VERSION: String = "5.2.4"
     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"
@@ -499,6 +499,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     func backgroundDownload() {
+        let messageUpdate = self.directUpdate ? "Update will occur now." : "Update will occur next time app moves to background."
         DispatchQueue.global(qos: .background).async {
             self.backgroundTaskID = UIApplication.shared.beginBackgroundTask(withName: "Finish Download Tasks") {
                 // End the task if time expires.
@@ -527,9 +528,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             }
             let latestVersionName = res.version
             if latestVersionName != "" && current.getVersionName() != latestVersionName {
-                let latest = self.implementation.getBundleInfoByVersionName(version: latestVersionName)
                 do {
-                    print("\(self.implementation.TAG) New bundle: \(latestVersionName) found. Current is: \(current.getVersionName()). Update will occur next time app moves to background.")
+                    print("\(self.implementation.TAG) New bundle: \(latestVersionName) found. Current is: \(current.getVersionName()). \(messageUpdate)")
                     var nextImpl = self.implementation.getBundleInfoByVersionName(version: latestVersionName)
                     if nextImpl == nil || ((nextImpl?.isDeleted()) != nil) {
                         if (nextImpl?.isDeleted()) != nil {
@@ -567,8 +567,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                         throw ObjectSavableError.checksum
                     }
                     if self.directUpdate {
-                        self.implementation.set(bundle: next)
-                        self._reload()
+                        _ = self.implementation.set(bundle: next)
+                        _ = self._reload()
                     } else {
                         self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
                         _ = self.implementation.setNextBundle(next: next.getId())

package/package.json

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