@capawesome/capacitor-live-update 6.7.1 → 6.7.2

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/LiveUpdate.java

@@ -104,6 +104,7 @@ public class LiveUpdate {
 
         if (config.getEnabled()) {
             if (wasUpdated() && config.getResetOnUpdate()) {
+                Logger.debug(LiveUpdatePlugin.TAG, "App was updated. Resetting to default bundle.");
                 reset();
             } else {
                 startRollbackTimer();

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/LiveUpdatePlugin.java

@@ -24,7 +24,7 @@ import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.Result;
 public class LiveUpdatePlugin extends Plugin {
 
     public static final String TAG = "LiveUpdate";
-    public static final String VERSION = "6.7.1";
+    public static final String VERSION = "6.7.2";
     public static final String SHARED_PREFERENCES_NAME = "CapawesomeLiveUpdate"; // DO NOT CHANGE
     public static final String ERROR_APP_ID_MISSING = "appId must be configured.";
     public static final String ERROR_BUNDLE_EXISTS = "bundle already exists.";

package/ios/Plugin/LiveUpdate.swift

@@ -35,11 +35,12 @@ import CommonCrypto
 
         if config.enabled {
             if wasUpdated() && config.resetOnUpdate {
+                CAPLog.print("[", LiveUpdatePlugin.tag, "] ", "App was updated. Resetting to default bundle.")
                 reset()
             } else {
                 startRollbackTimer()
             }
-            saveCurrentBundleVersion()
+            saveCurrentBundleShortVersionStringAndBundleVersion()
         }
     }
 
@@ -611,10 +612,10 @@ import CommonCrypto
         setCurrentCapacitorServerPathToDefaultWebAssetDir()
     }
 
-    private func saveCurrentBundleVersion() {
-        guard let currentBundleVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as? String else {
-            return
-        }
+    private func saveCurrentBundleShortVersionStringAndBundleVersion() {
+        let currentBundleShortVersionString = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
+        preferences.setLastBundleShortVersionString(currentBundleShortVersionString)
+        let currentBundleVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as? String
         preferences.setLastBundleVersion(currentBundleVersion)
     }
 
@@ -786,19 +787,24 @@ import CommonCrypto
     }
 
     private func wasUpdated() -> Bool {
+        guard let lastBundleShortVersionString = preferences.getLastBundleShortVersionString() else {
+            // If the last bundle short version is not set, the app may have been updated
+            return true
+        }
         guard let lastBundleVersionString = preferences.getLastBundleVersion() else {
-            return false
+            // If the last bundle version is not set, the app may have been updated
+            return true
         }
-        guard let lastBundleVersion = Int(lastBundleVersionString) else {
-            return false
+        guard let currentBundleShortVersionString = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String else {
+            // If the current bundle short version is not set, return true for safety reasons
+            return true
         }
         guard let currentBundleVersionString = Bundle.main.infoDictionary?["CFBundleVersion"] as? String else {
-            return false
-        }
-        guard let currentBundleVersion = Int(currentBundleVersionString) else {
-            return false
+            // If the current bundle version is not set, return true for safety reasons
+            return true
         }
-        return currentBundleVersion > lastBundleVersion
+        // `CFBundleVersion` is not unique across different versions of the app
+        return lastBundleShortVersionString + "_" + lastBundleVersionString != currentBundleShortVersionString + "_" + currentBundleVersionString
     }
 }
 

package/ios/Plugin/LiveUpdatePlugin.swift

@@ -8,7 +8,7 @@ import Capacitor
 @objc(LiveUpdatePlugin)
 public class LiveUpdatePlugin: CAPPlugin {
     public static let tag = "LiveUpdate"
-    public static let version = "6.7.1"
+    public static let version = "6.7.2"
     public static let userDefaultsPrefix = "CapawesomeLiveUpdate" // DO NOT CHANGE
 
     private var config: LiveUpdateConfig?

package/ios/Plugin/LiveUpdatePreferences.swift

@@ -3,6 +3,7 @@ import Foundation
 public class LiveUpdatePreferences: NSObject {
     private let channelKey = "channel" // DO NOT CHANGE
     private let customIdKey = "customId" // DO NOT CHANGE
+    private let lastBundleShortVersionStringKey = "lastBundleShortVersionString" // DO NOT CHANGE
     private let lastBundleVersionKey = "lastBundleVersion" // DO NOT CHANGE
 
     public func getChannel() -> String? {
@@ -12,6 +13,10 @@ public class LiveUpdatePreferences: NSObject {
     public func getCustomId() -> String? {
         return UserDefaults.standard.string(forKey: applyPrefix(to: customIdKey))
     }
+    
+    public func getLastBundleShortVersionString() -> String? {
+        return UserDefaults.standard.string(forKey: applyPrefix(to: lastBundleShortVersionStringKey))
+    }
 
     public func getLastBundleVersion() -> String? {
         return UserDefaults.standard.string(forKey: applyPrefix(to: lastBundleVersionKey))
@@ -30,9 +35,22 @@ public class LiveUpdatePreferences: NSObject {
         UserDefaults.standard.set(value, forKey: applyPrefix(to: customIdKey))
         UserDefaults.standard.synchronize()
     }
+    
+    public func setLastBundleShortVersionString(_ value: String?) {
+        if let value = value {
+            UserDefaults.standard.set(value, forKey: applyPrefix(to: lastBundleShortVersionStringKey))
+        } else {
+            UserDefaults.standard.removeObject(forKey: applyPrefix(to: lastBundleShortVersionStringKey))
+        }
+        UserDefaults.standard.synchronize()
+    }
 
-    public func setLastBundleVersion(_ value: String) {
-        UserDefaults.standard.set(value, forKey: applyPrefix(to: lastBundleVersionKey))
+    public func setLastBundleVersion(_ value: String?) {
+        if let value = value {
+            UserDefaults.standard.set(value, forKey: applyPrefix(to: lastBundleVersionKey))
+        } else {
+            UserDefaults.standard.removeObject(forKey: applyPrefix(to: lastBundleVersionKey))
+        }
         UserDefaults.standard.synchronize()
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/capacitor-live-update",
-  "version": "6.7.1",
+  "version": "6.7.2",
   "description": "Capacitor plugin to update your app remotely in real-time.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",