@capgo/capacitor-updater 4.0.0-alpha.21 → 4.0.0-alpha.24

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

@@ -46,7 +46,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.21";
+    public static final String pluginVersion = "4.0.0-alpha.24";
 
     public SharedPreferences.Editor editor;
     public SharedPreferences prefs;
@@ -98,7 +98,7 @@ public class CapacitorUpdater {
             this.notifyDownload(id, 75);
 
             ZipEntry entry;
-            while ((entry = zis.getNextBundleEntry()) != null) {
+            while ((entry = zis.getNextEntry()) != null) {
                 final File file = new File(targetDirectory, entry.getName());
                 final String canonicalPath = file.getCanonicalPath();
                 final String canonicalDir = (new File(String.valueOf(targetDirectory))).getCanonicalPath();
@@ -502,15 +502,12 @@ public class CapacitorUpdater {
                         ? BundleInfo.ID_BUILTIN
                         : fallback.getId()
         );
+        this.editor.commit();
     }
 
     public BundleInfo getNextBundle() {
-        final String id = this.prefs.getString(NEXT_VERSION, "");
-        if(id != "") {
-            return this.getBundleInfo(id);
-        } else {
-            return null;
-        }
+        final String id = this.prefs.getString(NEXT_VERSION, BundleInfo.ID_BUILTIN);
+        return this.getBundleInfo(id);
     }
 
     public boolean setNextBundle(final String next) {
@@ -518,11 +515,7 @@ public class CapacitorUpdater {
             this.editor.remove(NEXT_VERSION);
         } else {
             final BundleInfo newBundle = this.getBundleInfo(next);
-            if(newBundle.isBuiltin()) {
-                this.reset();
-                return true;
-            }
-            if (!this.bundleExists(next)) {
+            if (!newBundle.isBuiltin() && !this.bundleExists(next)) {
                 return false;
             }
             this.editor.putString(NEXT_VERSION, next);

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

@@ -88,6 +88,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         this.implementation.editor = this.editor;
         this.implementation.versionOs = Build.VERSION.RELEASE;
         this.implementation.deviceID = Settings.Secure.getString(this.getContext().getContentResolver(), Settings.Secure.ANDROID_ID);
+        Log.e(CapacitorUpdater.TAG, "init for device", this.implementation.deviceID);
 
         this.autoDeleteFailed = this.getConfig().getBoolean("autoDeleteFailed", true);
         this.autoDeletePrevious = this.getConfig().getBoolean("autoDeletePrevious", true);

package/ios/Plugin/CapacitorUpdater.swift

@@ -148,7 +148,7 @@ extension CustomError: LocalizedError {
     
     public let TAG = "✨  Capacitor-updater:";
     public let CAP_SERVER_PATH = "serverBasePath"
-    public let pluginVersion = "4.0.0-alpha.21"
+    public let pluginVersion = "4.0.0-alpha.24"
     public var statsUrl = ""
     public var appId = ""
     public var deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""
@@ -526,12 +526,8 @@ extension CustomError: LocalizedError {
     }
 
     public func getNextBundle() -> BundleInfo? {
-        let id: String = UserDefaults.standard.string(forKey: self.NEXT_VERSION) ?? ""
-        if(id != "") {
-            return self.getBundleInfo(id: id)
-        } else {
-            return nil
-        }
+        let id: String = UserDefaults.standard.string(forKey: self.NEXT_VERSION) ?? BundleInfo.ID_BUILTIN
+        return self.getBundleInfo(id: id)
     }
 
     public func setNextBundle(next: String?) -> Bool {
@@ -541,17 +537,13 @@ extension CustomError: LocalizedError {
             return false
         }
         let newBundle: BundleInfo = self.getBundleInfo(id: nextId)
-        if(newBundle.isBuiltin()) {
-            self.reset()
-            return true
-        }
         let bundle: URL = self.getBundleDirectory(id: nextId)
-        if (!bundle.exist) {
+        if (!newBundle.isBuiltin() && !bundle.exist) {
             return false
         }
-        UserDefaults.standard.set(next, forKey: self.NEXT_VERSION)
+        UserDefaults.standard.set(nextId, forKey: self.NEXT_VERSION)
         UserDefaults.standard.synchronize()
-        self.setBundleStatus(id: next!, status: BundleStatus.PENDING)
+        self.setBundleStatus(id: nextId, status: BundleStatus.PENDING)
         return true
     }
 }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -24,6 +24,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     private var autoDeletePrevious = false
     
     override public func load() {
+        print("\(self.implementation.TAG) init for device \(self.implementation.deviceID)")
         do {
             currentVersionNative = try Version(Bundle.main.buildVersionNumber ?? "0.0.0")
         } catch {

package/package.json

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