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

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.19";
+    public static final String pluginVersion = "4.0.0-alpha.21";
 
     public SharedPreferences.Editor editor;
     public SharedPreferences prefs;
@@ -98,7 +98,7 @@ public class CapacitorUpdater {
             this.notifyDownload(id, 75);
 
             ZipEntry entry;
-            while ((entry = zis.getNextEntry()) != null) {
+            while ((entry = zis.getNextBundleEntry()) != null) {
                 final File file = new File(targetDirectory, entry.getName());
                 final String canonicalPath = file.getCanonicalPath();
                 final String canonicalDir = (new File(String.valueOf(targetDirectory))).getCanonicalPath();
@@ -276,10 +276,12 @@ public class CapacitorUpdater {
     }
 
     public Boolean set(final String id) {
-
         final BundleInfo newBundle = this.getBundleInfo(id);
+        if(newBundle.isBuiltin()) {
+            this.reset();
+            return true;
+        }
         final File bundle = this.getBundleDirectory(id);
-
         Log.i(TAG, "Setting next active bundle: " + id);
         if (this.bundleExists(id)) {
             this.setCurrentBundle(bundle);
@@ -293,7 +295,7 @@ public class CapacitorUpdater {
 
     public void commit(final BundleInfo bundle) {
         this.setBundleStatus(bundle.getId(), BundleStatus.SUCCESS);
-        this.setFallbackVersion(bundle);
+        this.setFallbackBundle(bundle);
     }
 
     public void reset() {
@@ -306,8 +308,8 @@ public class CapacitorUpdater {
 
     public void reset(final boolean internal) {
         this.setCurrentBundle(new File("public"));
-        this.setFallbackVersion(null);
-        this.setNext(null);
+        this.setFallbackBundle(null);
+        this.setNextBundle(null);
         if(!internal) {
             this.sendStats("reset", this.getCurrentBundle().getVersionName());
         }
@@ -489,12 +491,12 @@ public class CapacitorUpdater {
         return this.getCurrentBundlePath().equals("public");
     }
 
-    public BundleInfo getFallbackVersion() {
+    public BundleInfo getFallbackBundle() {
         final String id = this.prefs.getString(FALLBACK_VERSION, BundleInfo.ID_BUILTIN);
         return this.getBundleInfo(id);
     }
 
-    private void setFallbackVersion(final BundleInfo fallback) {
+    private void setFallbackBundle(final BundleInfo fallback) {
         this.editor.putString(FALLBACK_VERSION,
                 fallback == null
                         ? BundleInfo.ID_BUILTIN
@@ -502,7 +504,7 @@ public class CapacitorUpdater {
         );
     }
 
-    public BundleInfo getNextVersion() {
+    public BundleInfo getNextBundle() {
         final String id = this.prefs.getString(NEXT_VERSION, "");
         if(id != "") {
             return this.getBundleInfo(id);
@@ -511,10 +513,15 @@ public class CapacitorUpdater {
         }
     }
 
-    public boolean setNext(final String next) {
+    public boolean setNextBundle(final String next) {
         if (next == null) {
             this.editor.remove(NEXT_VERSION);
         } else {
+            final BundleInfo newBundle = this.getBundleInfo(next);
+            if(newBundle.isBuiltin()) {
+                this.reset();
+                return true;
+            }
             if (!this.bundleExists(next)) {
                 return false;
             }

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

@@ -84,8 +84,8 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         this.implementation.appId = config.getString("appId", "");
         this.implementation.statsUrl = this.getConfig().getString("statsUrl", statsUrlDefault);
         this.implementation.documentsDir = this.getContext().getFilesDir();
-        this.implementation.prefs = this.getContext().getSharedPreferences(WebView.WEBVIEW_PREFS_NAME, Activity.MODE_PRIVATE);
-        this.implementation.editor = this.prefs.edit();
+        this.implementation.prefs = this.prefs;
+        this.implementation.editor = this.editor;
         this.implementation.versionOs = Build.VERSION.RELEASE;
         this.implementation.deviceID = Settings.Secure.getString(this.getContext().getContentResolver(), Settings.Secure.ANDROID_ID);
 
@@ -236,7 +236,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
 
         try {
             Log.i(CapacitorUpdater.TAG, "Setting next active id " + id);
-            if (!this.implementation.setNext(id)) {
+            if (!this.implementation.setNextBundle(id)) {
                 Log.e(CapacitorUpdater.TAG, "Set next id failed. Bundle " + id + " does not exist.");
                 call.reject("Set next id failed. Bundle " + id + " does not exist.");
             } else {
@@ -329,7 +329,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     }
 
     private boolean _reset(final Boolean toLastSuccessful) {
-        final BundleInfo fallback = this.implementation.getFallbackVersion();
+        final BundleInfo fallback = this.implementation.getFallbackBundle();
         this.implementation.reset();
 
         if (toLastSuccessful && !fallback.isBuiltin()) {
@@ -388,7 +388,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     }
 
     @PluginMethod
-    public void delayUpdate(final PluginCall call) {
+    public void setDelay(final PluginCall call) {
         try {
             final String kind = call.getString("kind");
             final String value = call.getString("value");
@@ -409,54 +409,61 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         }
     }
 
-    private boolean _cancelDelay() {
+    private boolean _cancelDelay(String source) {
         try {
             this.editor.remove(DELAY_UPDATE);
             this.editor.remove(DELAY_UPDATE_VAL);
             this.editor.commit();
-            Log.i(CapacitorUpdater.TAG, "delay Canceled");
+            Log.i(CapacitorUpdater.TAG, "delay canceled from " + source);
+            return true;
         }
         catch(final Exception e) {
             Log.e(CapacitorUpdater.TAG, "Failed to cancel update delay", e);
-            call.reject("Failed to cancel update delay", e);
+            return false;
         }
     }
 
     @PluginMethod
     public void cancelDelay(final PluginCall call) {
-        this._cancelDelay();
-        call.resolve();
+        if(this._cancelDelay("JS")) {
+            call.resolve();
+        } else {
+            call.reject("Failed to cancel delay");
+        }
     }
 
     private void _checkCancelDelay(Boolean killed) {
         final String delayUpdate = this.prefs.getString(DELAY_UPDATE, "");
         if ("".equals(delayUpdate)) {
             if ("background".equals(delayUpdate) && !killed) {
-                this._cancelDelay();
+                this._cancelDelay("background check");
             } else if ("kill".equals(delayUpdate) && killed) {
-                this._cancelDelay();
+                this._cancelDelay("kill check");
             }
             final String delayVal = this.prefs.getString(DELAY_UPDATE_VAL, "");
-            if (delayVal == null) {
-                this._cancelDelay();
+            if ("".equals(delayVal)) {
+                this._cancelDelay("delayVal absent");
             } else if ("date".equals(delayUpdate)) {
                 try {
                     final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
                     Date date = sdf.parse(delayVal);
-                    Date today = new Date();
-                    if (date.compareTo(today) > 0)  {
-                        this._cancelDelay();
+                    if (date.compareTo(new Date()) > 0)  {
+                        this._cancelDelay("date expired");
                     }
                 }
                 catch(final Exception e) {
-                    Log.e(CapacitorUpdater.TAG, "Failed to parse delay date", e);
-                    this._cancelDelay();
+                    this._cancelDelay("date parsing issue");
                 }
 
             } else if ("nativeVersion".equals(delayUpdate)) {
-                final Version versionLimit = new Version(delayVal);
-                if (this.currentVersionNative.isAtLeast(versionLimit)) {
-                    this._cancelDelay();
+                try {
+                    final Version versionLimit = new Version(delayVal);
+                    if (this.currentVersionNative.isAtLeast(versionLimit)) {
+                        this._cancelDelay("nativeVersion above limit");
+                    }
+                }
+                catch(final Exception e) {
+                    this._cancelDelay("nativeVersion parsing issue");
                 }
             }
         }
@@ -490,6 +497,8 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         }
     }
 
+
+
     @Override // appMovedToForeground
     public void onActivityStarted(@NonNull final Activity activity) {
         if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled()) {
@@ -522,7 +531,7 @@ 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.setNext(latest.getId());
+                                        CapacitorUpdaterPlugin.this.implementation.setNextBundle(latest.getId());
                                         return;
                                     }
                                 }
@@ -537,7 +546,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                                             final String url = (String) res.get("url");
                                             final BundleInfo next = CapacitorUpdaterPlugin.this.implementation.download(url, latestVersionName);
 
-                                            CapacitorUpdaterPlugin.this.implementation.setNext(next.getId());
+                                            CapacitorUpdaterPlugin.this.implementation.setNextBundle(next.getId());
                                         } catch (final Exception e) {
                                             Log.e(CapacitorUpdater.TAG, "error downloading file", e);
                                         }
@@ -561,16 +570,15 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     public void onActivityStopped(@NonNull final Activity activity) {
         Log.i(CapacitorUpdater.TAG, "Checking for pending update");
         try {
-            final Boolean delayUpdate = this.prefs.getString(DELAY_UPDATE, false);
+            final String delayUpdate = this.prefs.getString(DELAY_UPDATE, "");
             this._checkCancelDelay(false);
-            if (delayUpdate) {
+            if ("".equals(delayUpdate)) {
                 Log.i(CapacitorUpdater.TAG, "Update delayed to next backgrounding");
                 return;
             }
-
-            final BundleInfo fallback = this.implementation.getFallbackVersion();
+            final BundleInfo fallback = this.implementation.getFallbackBundle();
             final BundleInfo current = this.implementation.getCurrentBundle();
-            final BundleInfo next = this.implementation.getNextVersion();
+            final BundleInfo next = this.implementation.getNextBundle();
 
             final Boolean success = current.getStatus() == BundleStatus.SUCCESS;
 
@@ -582,7 +590,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                 Log.d(CapacitorUpdater.TAG, "Next bundle is: " + next.getVersionName());
                 if (this.implementation.set(next) && this._reload()) {
                     Log.i(CapacitorUpdater.TAG, "Updated to bundle: " + next.getVersionName());
-                    this.implementation.setNext(null);
+                    this.implementation.setNextBundle(null);
                 } else {
                     Log.e(CapacitorUpdater.TAG, "Update to bundle: " + next.getVersionName() + " Failed!");
                 }

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.19"
+    public let pluginVersion = "4.0.0-alpha.21"
     public var statsUrl = ""
     public var appId = ""
     public var deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""
@@ -400,8 +400,8 @@ extension CustomError: LocalizedError {
     
     public func reset(isInternal: Bool) {
         self.setCurrentBundle(bundle: "")
-        self.setFallbackVersion(fallback: Optional<BundleInfo>.none)
-        let _ = self.setNext(next: Optional<String>.none)
+        self.setFallbackBundle(fallback: Optional<BundleInfo>.none)
+        let _ = self.setNextBundle(next: Optional<String>.none)
         if(!isInternal) {
             sendStats(action: "reset", versionName: self.getCurrentBundle().getVersionName())
         }
@@ -409,7 +409,7 @@ extension CustomError: LocalizedError {
     
     public func commit(bundle: BundleInfo) {
         self.setBundleStatus(id: bundle.getId(), status: BundleStatus.SUCCESS)
-        self.setFallbackVersion(fallback: bundle)
+        self.setFallbackBundle(fallback: bundle)
     }
     
     public func rollback(bundle: BundleInfo) {
@@ -515,17 +515,17 @@ extension CustomError: LocalizedError {
         return (UserDefaults.standard.string(forKey: self.CAP_SERVER_PATH) ?? "") == self.DEFAULT_FOLDER
     }
 
-    public func getFallbackVersion() -> BundleInfo {
+    public func getFallbackBundle() -> BundleInfo {
         let id: String = UserDefaults.standard.string(forKey: self.FALLBACK_VERSION) ?? BundleInfo.ID_BUILTIN
         return self.getBundleInfo(id: id)
     }
 
-    private func setFallbackVersion(fallback: BundleInfo?) {
+    private func setFallbackBundle(fallback: BundleInfo?) {
         UserDefaults.standard.set(fallback == nil ? BundleInfo.ID_BUILTIN : fallback!.getId(), forKey: self.FALLBACK_VERSION)
         UserDefaults.standard.synchronize()
     }
 
-    public func getNextVersion() -> BundleInfo? {
+    public func getNextBundle() -> BundleInfo? {
         let id: String = UserDefaults.standard.string(forKey: self.NEXT_VERSION) ?? ""
         if(id != "") {
             return self.getBundleInfo(id: id)
@@ -534,7 +534,7 @@ extension CustomError: LocalizedError {
         }
     }
 
-    public func setNext(next: String?) -> Bool {
+    public func setNextBundle(next: String?) -> Bool {
         guard let nextId = next else {
             UserDefaults.standard.removeObject(forKey: self.NEXT_VERSION)
             UserDefaults.standard.synchronize()

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -140,7 +140,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             return
         }
         print("\(self.implementation.TAG) Setting next active id \(id)")
-        if (!self.implementation.setNext(next: id)) {
+        if (!self.implementation.setNextBundle(next: id)) {
             print("\(self.implementation.TAG) Set next version failed. id \(id) does not exist.")
             call.reject("Set next version failed. id \(id) does not exist.")
         } else {
@@ -199,7 +199,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         guard let bridge = self.bridge else { return false }
 
         if let vc = bridge.viewController as? CAPBridgeViewController {
-            let fallback: BundleInfo = self.implementation.getFallbackVersion()
+            let fallback: BundleInfo = self.implementation.getFallbackBundle()
             if (toLastSuccessful && !fallback.isBuiltin()) {
                 print("\(self.implementation.TAG) Resetting to: \(fallback.toString())")
                 return self.implementation.set(bundle: fallback) && self._reload()
@@ -294,7 +294,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                         self._cancelDelay(source: "nativeVersion above limit")
                     }
                 } catch {
-                    self._cancelDelay(source: "nativeVersion cannot parse")
+                    self._cancelDelay(source: "nativeVersion parsing issue")
                 }
             }
         }
@@ -372,7 +372,7 @@ 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.setNext(next: latest!.getId())
+                            let _ = self.implementation.setNextBundle(next: latest!.getId())
                             return
                         }
                     }
@@ -381,7 +381,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                         print("\(self.implementation.TAG) New bundle: \(latestVersionName!) found. Current is: \(current.getVersionName()). Update will occur next time app moves to background.")
                         let next = try self.implementation.download(url: downloadUrl, version: latestVersionName!)
 
-                        let _ = self.implementation.setNext(next: next.getId())
+                        let _ = self.implementation.setNextBundle(next: next.getId())
                     } catch {
                         print("\(self.implementation.TAG) Error downloading file", error.localizedDescription)
                     }
@@ -401,9 +401,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             return
         }
 
-        let fallback: BundleInfo = self.implementation.getFallbackVersion()
+        let fallback: BundleInfo = self.implementation.getFallbackBundle()
         let current: BundleInfo = self.implementation.getCurrentBundle()
-        let next: BundleInfo? = self.implementation.getNextVersion()
+        let next: BundleInfo? = self.implementation.getNextBundle()
 
         let success: Bool = current.getStatus() == BundleStatus.SUCCESS.localizedString
 
@@ -414,7 +414,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             print("\(self.implementation.TAG) Next bundle is: \(next!.toString())")
             if (self.implementation.set(bundle: next!) && self._reload()) {
                 print("\(self.implementation.TAG) Updated to bundle: \(next!)")
-                let _ = self.implementation.setNext(next: Optional<String>.none)
+                let _ = self.implementation.setNextBundle(next: Optional<String>.none)
             } else {
                 print("\(self.implementation.TAG) Updated to bundle: \(next!) Failed!")
             }

package/package.json

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