@capgo/capacitor-updater 7.11.12 → 7.12.0

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

@@ -58,7 +58,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.11.12";
+    private final String PLUGIN_VERSION = "7.12.0";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -73,6 +73,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private Boolean autoUpdate = false;
     private String updateUrl = "";
     private Version currentVersionNative;
+    private String currentBuildVersion;
     private Thread backgroundTask;
     private Boolean taskRunning = false;
     private Boolean keepUrlPathAfterReload = false;
@@ -169,6 +170,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 }
             }
             this.currentVersionNative = new Version(this.getConfig().getString("version", pInfo.versionName));
+            this.currentBuildVersion = Integer.toString(pInfo.versionCode);
             this.delayUpdateUtils = new DelayUpdateUtils(
                 this.prefs,
                 this.editor,
@@ -389,8 +391,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private boolean checkIfRecentlyInstalledOrUpdated() {
-        String currentVersion = this.currentVersionNative.getOriginalString();
-        String lastKnownVersion = this.prefs.getString("LatestVersionNative", "");
+        String currentVersion = this.currentBuildVersion;
+        String lastKnownVersion = this.prefs.getString("LatestNativeBuildVersion", "");
 
         if (lastKnownVersion.isEmpty()) {
             // First time running, consider it as recently installed
@@ -428,32 +430,21 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private void cleanupObsoleteVersions() {
-        try {
-            final Version previous = new Version(this.prefs.getString("LatestVersionNative", ""));
-            try {
-                if (
-                    !"".equals(previous.getOriginalString()) &&
-                    !Objects.equals(this.currentVersionNative.getOriginalString(), previous.getOriginalString())
-                ) {
-                    logger.info("New native version detected: " + this.currentVersionNative);
-                    this.implementation.reset(true);
-                    final List<BundleInfo> installed = this.implementation.list(false);
-                    for (final BundleInfo bundle : installed) {
-                        try {
-                            logger.info("Deleting obsolete bundle: " + bundle.getId());
-                            this.implementation.delete(bundle.getId());
-                        } catch (final Exception e) {
-                            logger.error("Failed to delete: " + bundle.getId() + " " + e.getMessage());
-                        }
-                    }
+        final String previous = this.prefs.getString("LatestNativeBuildVersion", "");
+        if (!"".equals(previous) && !Objects.equals(this.currentBuildVersion, previous)) {
+            logger.info("New native build version detected: " + this.currentBuildVersion);
+            this.implementation.reset(true);
+            final List<BundleInfo> installed = this.implementation.list(false);
+            for (final BundleInfo bundle : installed) {
+                try {
+                    logger.info("Deleting obsolete bundle: " + bundle.getId());
+                    this.implementation.delete(bundle.getId());
+                } catch (final Exception e) {
+                    logger.error("Failed to delete: " + bundle.getId() + " " + e.getMessage());
                 }
-            } catch (final Exception e) {
-                logger.error("Could not determine the current version " + e.getMessage());
             }
-        } catch (final Exception e) {
-            logger.error("Error calculating previous native version " + e.getMessage());
         }
-        this.editor.putString("LatestVersionNative", this.currentVersionNative.toString());
+        this.editor.putString("LatestNativeBuildVersion", this.currentBuildVersion);
         this.editor.apply();
     }
 

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

@@ -254,7 +254,7 @@ public class CapgoUpdater {
                                 // Cleanup download tracking
                                 DownloadWorkerManager.cancelBundleDownload(activity, id, version);
                                 Map<String, Object> ret = new HashMap<>();
-                                ret.put("version", getCurrentBundle().getVersionName());
+                                ret.put("version", version);
                                 ret.put("error", "finish_download_fail");
                                 sendStats("finish_download_fail", version);
                                 notifyListeners("downloadFailed", ret);
@@ -275,7 +275,7 @@ public class CapgoUpdater {
                             // Cleanup download tracking for failed downloads
                             DownloadWorkerManager.cancelBundleDownload(activity, id, failedVersion);
                             Map<String, Object> ret = new HashMap<>();
-                            ret.put("version", getCurrentBundle().getVersionName());
+                            ret.put("version", failedVersion);
                             if ("low_mem_fail".equals(error)) {
                                 sendStats("low_mem_fail", failedVersion);
                             }
@@ -371,7 +371,7 @@ public class CapgoUpdater {
             }
 
             final Map<String, Object> ret = new HashMap<>();
-            ret.put("version", CapgoUpdater.this.getCurrentBundle().getVersionName());
+            ret.put("version", version);
 
             CapgoUpdater.this.notifyListeners("downloadFailed", ret);
             CapgoUpdater.this.sendStats("download_fail");
@@ -413,7 +413,7 @@ public class CapgoUpdater {
         } catch (IOException e) {
             e.printStackTrace();
             final Map<String, Object> ret = new HashMap<>();
-            ret.put("version", CapgoUpdater.this.getCurrentBundle().getVersionName());
+            ret.put("version", version);
             CapgoUpdater.this.notifyListeners("downloadFailed", ret);
             CapgoUpdater.this.sendStats("download_fail");
             return false;

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.11.12"
+    private let PLUGIN_VERSION: String = "7.12.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"
@@ -59,6 +59,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     private var statsUrl = ""
     private var backgroundTaskID: UIBackgroundTaskIdentifier = UIBackgroundTaskIdentifier.invalid
     private var currentVersionNative: Version = "0.0.0"
+    private var currentBuildVersion: String = "0"
     private var autoUpdate = false
     private var appReadyTimeout = 10000
     private var appReadyCheck: DispatchWorkItem?
@@ -107,6 +108,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         } catch {
             logger.error("Cannot parse versionName \(versionName)")
         }
+        currentBuildVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "0"
         logger.info("version native \(self.currentVersionNative.description)")
         implementation.versionBuild = getConfig().getString("version", Bundle.main.versionName)!
         autoDeleteFailed = getConfig().getBoolean("autoDeleteFailed", true)
@@ -235,13 +237,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     private func cleanupObsoleteVersions() {
-        var LatestVersionNative: Version = "0.0.0"
-        do {
-            LatestVersionNative = try Version(UserDefaults.standard.string(forKey: "LatestVersionNative") ?? "0.0.0")
-        } catch {
-            logger.error("Cannot get version native \(currentVersionNative)")
-        }
-        if LatestVersionNative != "0.0.0" && self.currentVersionNative.description != LatestVersionNative.description {
+        let previous = UserDefaults.standard.string(forKey: "LatestNativeBuildVersion") ?? "0"
+        if previous != "0" && self.currentBuildVersion != previous {
             _ = self._reset(toLastSuccessful: false)
             let res = implementation.list()
             res.forEach { version in
@@ -252,7 +249,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 }
             }
         }
-        UserDefaults.standard.set( self.currentVersionNative.description, forKey: "LatestVersionNative")
+        UserDefaults.standard.set(self.currentBuildVersion, forKey: "LatestNativeBuildVersion")
         UserDefaults.standard.synchronize()
     }
 
@@ -846,10 +843,10 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private func checkIfRecentlyInstalledOrUpdated() -> Bool {
         let userDefaults = UserDefaults.standard
-        let currentVersion = self.currentVersionNative.description
-        let lastKnownVersion = userDefaults.string(forKey: "LatestVersionNative") ?? "0.0.0"
+        let currentVersion = self.currentBuildVersion
+        let lastKnownVersion = userDefaults.string(forKey: "LatestNativeBuildVersion") ?? "0"
 
-        if lastKnownVersion == "0.0.0" {
+        if lastKnownVersion == "0" {
             // First time running, consider it as recently installed
             return true
         } else if lastKnownVersion != currentVersion {

package/package.json

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