@capgo/capacitor-updater 4.0.0-alpha.52 → 4.0.0-alpha.55

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

@@ -47,7 +47,7 @@ public class CapacitorUpdater {
     private static final String bundleDirectory = "versions";
 
     public static final String TAG = "Capacitor-updater";
-    public static final String pluginVersion = "4.0.0-alpha.52";
+    public static final String pluginVersion = "4.0.0-alpha.55";
 
     public SharedPreferences.Editor editor;
     public SharedPreferences prefs;
@@ -261,7 +261,8 @@ public class CapacitorUpdater {
 
     public Boolean delete(final String id, final Boolean removeInfo) throws IOException {
         final BundleInfo deleted = this.getBundleInfo(id);
-        if (deleted.isBuiltin()) {
+        if (deleted.isBuiltin() || self.getCurrentBundleId() == id) {
+            Log.e(TAG, "Cannot delete " + id);
             return false;
         }
         final File bundle = new File(this.documentsDir, bundleDirectory + "/" + id);

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

@@ -578,10 +578,10 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                                     }
                                     if(latest.isDownloaded()){
                                         Log.e(CapacitorUpdater.TAG, "Latest bundle already exists and download is NOT required. Update will occur next time app moves to background.");
-                                        CapacitorUpdaterPlugin.this.implementation.setNextBundle(latest.getId());
                                         final JSObject ret = new JSObject();
                                         ret.put("bundle", latest.toJSON());
                                         CapacitorUpdaterPlugin.this.notifyListeners("updateAvailable", ret);
+                                        CapacitorUpdaterPlugin.this.implementation.setNextBundle(latest.getId());
                                         return;
                                     }
                                 }
@@ -678,7 +678,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
             this.implementation.sendStats("update_fail", current.getVersionName());
             this.implementation.setError(current);
             this._reset(true);
-            if (CapacitorUpdaterPlugin.this.autoDeleteFailed) {
+            if (CapacitorUpdaterPlugin.this.autoDeleteFailed && !current.isBuiltin()) {
                 Log.i(CapacitorUpdater.TAG, "Deleting failing bundle: " + current.getVersionName());
                 try {
                     final Boolean res = this.implementation.delete(current.getId(), false);

package/ios/Plugin/CapacitorUpdater.swift

@@ -146,7 +146,7 @@ extension CustomError: LocalizedError {
     
     public let TAG = "✨  Capacitor-updater:";
     public let CAP_SERVER_PATH = "serverBasePath"
-    public let pluginVersion = "4.0.0-alpha.52"
+    public let pluginVersion = "4.0.0-alpha.55"
     public var statsUrl = ""
     public var appId = ""
     public var deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""
@@ -343,7 +343,8 @@ extension CustomError: LocalizedError {
     
     public func delete(id: String, removeInfo: Bool) -> Bool {
         let deleted: BundleInfo = self.getBundleInfo(id: id)
-        if (deleted.isBuiltin()) {
+        if (deleted.isBuiltin() || self.getCurrentBundleId() == id) {
+            print("\(self.TAG) Cannot delete \(id)")
             return false
         }
         let destHot = documentsDir.appendingPathComponent(bundleDirectoryHot).appendingPathComponent(id)
@@ -434,7 +435,7 @@ extension CustomError: LocalizedError {
         let fallback: BundleInfo = self.getFallbackBundle()
         print("\(self.TAG) Fallback bundle is: \(fallback.toString())")
         print("\(self.TAG) Version successfully loaded: \(bundle.toString())")
-        if(autoDeletePrevious) {
+        if(autoDeletePrevious && !fallback.isBuiltin()) {
             let res = self.delete(id: fallback.getId())
             if (res) {
                 print("\(self.TAG) Deleted previous bundle: \(fallback.toString())")

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -341,7 +341,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             self.implementation.sendStats(action: "update_fail", versionName: current.getVersionName())
             self.implementation.setError(bundle: current)
             _ = self._reset(toLastSuccessful: true)
-            if (self.autoDeleteFailed) {
+            if (self.autoDeleteFailed && !current.isBuiltin()) {
                 print("\(self.implementation.TAG) Deleting failing bundle: \(current.toString())")
                 let res = self.implementation.delete(id: current.getId(), removeInfo: false)
                 if (!res) {
@@ -392,8 +392,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                         }
                         if(latest!.isDownloaded()){
                             print("\(self.implementation.TAG) Latest version already exists and download is NOT required. Update will occur next time app moves to background.")
-                            let _ = self.implementation.setNextBundle(next: latest!.getId())
                             self.notifyListeners("updateAvailable", data: ["bundle": current.toJSON()])
+                            let _ = self.implementation.setNextBundle(next: latest!.getId())
                             return
                         }
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.0.0-alpha.52",
+  "version": "4.0.0-alpha.55",
   "license": "LGPL-3.0-only",
   "description": "OTA update for capacitor apps",
   "main": "dist/plugin.cjs.js",