@capgo/capacitor-updater 4.0.0-alpha.28 → 4.0.0-alpha.31

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.28";
+    public static final String pluginVersion = "4.0.0-alpha.31";
 
     public SharedPreferences.Editor editor;
     public SharedPreferences prefs;

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

@@ -180,9 +180,14 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     public void download(final PluginCall call) {
         final String url = call.getString("url");
         final String version = call.getString("version");
-        if (url == null || version == null) {
-            Log.e(CapacitorUpdater.TAG, "missing url or version");
-            call.reject("missing url or version");
+        if (url == null) {
+            Log.e(CapacitorUpdater.TAG, "Download called without url");
+            call.reject("Download called without url");
+            return;
+        }
+        if (version == null) {
+            Log.e(CapacitorUpdater.TAG, "Download called without version");
+            call.reject("Download called without version");
             return;
         }
         try {
@@ -236,7 +241,11 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     @PluginMethod
     public void next(final PluginCall call) {
         final String id = call.getString("id");
-
+        if (id == null) {
+            Log.e(CapacitorUpdater.TAG, "Next called without id");
+            call.reject("Next called without id");
+            return;
+        }
         try {
             Log.i(CapacitorUpdater.TAG, "Setting next active id " + id);
             if (!this.implementation.setNextBundle(id)) {
@@ -254,7 +263,11 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     @PluginMethod
     public void set(final PluginCall call) {
         final String id = call.getString("id");
-
+        if (id == null) {
+            Log.e(CapacitorUpdater.TAG, "Set called without id");
+            call.reject("Set called without id");
+            return;
+        }
         try {
             Log.i(CapacitorUpdater.TAG, "Setting active bundle " + id);
             if (!this.implementation.set(id)) {
@@ -273,6 +286,11 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     @PluginMethod
     public void delete(final PluginCall call) {
         final String id = call.getString("id");
+        if (id == null) {
+            Log.e(CapacitorUpdater.TAG, "missing id");
+            call.reject("missing id");
+            return;
+        }
         Log.i(CapacitorUpdater.TAG, "Deleting id: " + id);
         try {
             final Boolean res = this.implementation.delete(id);
@@ -548,7 +566,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);
-
+                                            this.notifyListeners("updateAvailable", next);
                                             CapacitorUpdaterPlugin.this.implementation.setNextBundle(next.getId());
                                         } catch (final Exception e) {
                                             Log.e(CapacitorUpdater.TAG, "error downloading file", e);

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.28"
+    public let pluginVersion = "4.0.0-alpha.31"
     public var statsUrl = ""
     public var appId = ""
     public var deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -30,12 +30,12 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         } catch {
             print("\(self.implementation.TAG) Cannot get version native \(currentVersionNative)")
         }
-        autoDeleteFailed = getConfigValue("autoDeleteFailed") as? Bool ?? false
-        autoDeletePrevious = getConfigValue("autoDeletePrevious") as? Bool ?? false
-        updateUrl = getConfigValue("updateUrl") as? String ?? CapacitorUpdaterPlugin.updateUrlDefault
-        autoUpdate = getConfigValue("autoUpdate") as? Bool ?? false
-        appReadyTimeout = getConfigValue("appReadyTimeout") as? Int ?? 10000
-        resetWhenUpdate = getConfigValue("resetWhenUpdate") as? Bool ?? true
+        autoDeleteFailed = getConfig().getBoolean("autoDeleteFailed", false)
+        autoDeletePrevious = getConfig().getBoolean("autoDeletePrevious", false)
+        updateUrl = getConfig().getString("updateUrl") ?? CapacitorUpdaterPlugin.updateUrlDefault
+        autoUpdate = getConfig().getBoolean("autoUpdate", false)
+        appReadyTimeout = getConfig().getInt("appReadyTimeout", 10000)
+        resetWhenUpdate = getConfig().getBoolean("resetWhenUpdate", true)
 
         implementation.appId = Bundle.main.bundleIdentifier ?? ""
         implementation.notifyDownload = notifyDownload
@@ -43,8 +43,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         if (config?["appId"] != nil) {
             implementation.appId = config?["appId"] as! String
         }
-        implementation.statsUrl = getConfigValue("statsUrl") as? String ?? CapacitorUpdaterPlugin.statsUrlDefault
-
+        implementation.statsUrl = getConfig().getString("statsUrl") ?? CapacitorUpdaterPlugin.updateUrlDefault
         if (resetWhenUpdate) {
             self.cleanupObsoleteVersions()
         }
@@ -381,7 +380,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                     do {
                         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!)
-
+                        self.notifyListeners("updateAvailable", data: ["version": next.toJSON()])
                         let _ = self.implementation.setNextBundle(next: next.getId())
                     } catch {
                         print("\(self.implementation.TAG) Error downloading file", error.localizedDescription)

package/package.json

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