@capgo/capacitor-updater 7.2.19 → 7.2.20

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

@@ -6,9 +6,10 @@
 
 package ee.forgr.capacitor_updater;
 
-import com.getcapacitor.JSObject;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 import java.util.TimeZone;
 import org.json.JSONException;
@@ -109,10 +110,6 @@ public class BundleInfo {
         return new BundleInfo(this.id, this.version, status, this.downloaded, this.checksum);
     }
 
-    public static BundleInfo fromJSON(final JSObject json) throws JSONException {
-        return BundleInfo.fromJSON(json.toString());
-    }
-
     public static BundleInfo fromJSON(final String jsonString) throws JSONException {
         JSONObject json = new JSONObject(new JSONTokener(jsonString));
         return new BundleInfo(
@@ -124,8 +121,8 @@ public class BundleInfo {
         );
     }
 
-    public JSObject toJSON() {
-        final JSObject result = new JSObject();
+    public Map<String, Object> toJSONMap() {
+        final Map<String, Object> result = new HashMap<>();
         result.put("id", this.getId());
         result.put("version", this.getVersionName());
         result.put("downloaded", this.getDownloaded());
@@ -149,6 +146,23 @@ public class BundleInfo {
 
     @Override
     public String toString() {
-        return this.toJSON().toString();
+        return (
+            "BundleInfo{" +
+            "id='" +
+            getId() +
+            '\'' +
+            ", version='" +
+            getVersionName() +
+            '\'' +
+            ", downloaded='" +
+            getDownloaded() +
+            '\'' +
+            ", checksum='" +
+            getChecksum() +
+            '\'' +
+            ", status=" +
+            getStatus() +
+            '}'
+        );
     }
 }

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

@@ -6,8 +6,8 @@
 
 package ee.forgr.capacitor_updater;
 
-import com.getcapacitor.JSObject;
+import java.util.Map;
 
 public interface Callback {
-    void callback(JSObject jsoObject);
+    void callback(Map<String, Object> result);
 }

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

@@ -16,8 +16,6 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.work.Data;
 import androidx.work.WorkInfo;
 import androidx.work.WorkManager;
-import com.getcapacitor.JSObject;
-import com.getcapacitor.plugin.WebView;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.io.BufferedInputStream;
@@ -30,8 +28,10 @@ import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -64,6 +64,7 @@ public class CapacitorUpdater {
     public String versionBuild = "";
     public String versionCode = "";
     public String versionOs = "";
+    public String CAP_SERVER_PATH = "";
 
     public String customId = "";
     public String statsUrl = "";
@@ -117,7 +118,7 @@ public class CapacitorUpdater {
 
     void directUpdateFinish(final BundleInfo latest) {}
 
-    void notifyListeners(final String id, final JSObject res) {}
+    void notifyListeners(final String id, final Map<String, Object> res) {}
 
     private String randomString() {
         final StringBuilder sb = new StringBuilder(10);
@@ -240,7 +241,7 @@ public class CapacitorUpdater {
                                     id,
                                     new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "")
                                 );
-                                JSObject ret = new JSObject();
+                                Map<String, Object> ret = new HashMap<>();
                                 ret.put("version", getCurrentBundle().getVersionName());
                                 ret.put("error", "finish_download_fail");
                                 sendStats("finish_download_fail", version);
@@ -256,7 +257,7 @@ public class CapacitorUpdater {
                                 id,
                                 new BundleInfo(id, failedVersion, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "")
                             );
-                            JSObject ret = new JSObject();
+                            Map<String, Object> ret = new HashMap<>();
                             ret.put("version", getCurrentBundle().getVersionName());
                             if ("low_mem_fail".equals(error)) {
                                 sendStats("low_mem_fail", failedVersion);
@@ -350,7 +351,7 @@ public class CapacitorUpdater {
                 Log.i(CapacitorUpdater.TAG, "Double error, cannot cleanup: " + version);
             }
 
-            final JSObject ret = new JSObject();
+            final Map<String, Object> ret = new HashMap<>();
             ret.put("version", CapacitorUpdater.this.getCurrentBundle().getVersionName());
 
             CapacitorUpdater.this.notifyListeners("downloadFailed", ret);
@@ -375,8 +376,8 @@ public class CapacitorUpdater {
             BundleInfo next = new BundleInfo(id, version, BundleStatus.PENDING, new Date(System.currentTimeMillis()), checksum);
             this.saveBundleInfo(id, next);
 
-            final JSObject ret = new JSObject();
-            ret.put("bundle", next.toJSON());
+            final Map<String, Object> ret = new HashMap<>();
+            ret.put("bundle", next.toJSONMap());
             CapacitorUpdater.this.notifyListeners("updateAvailable", ret);
             if (setNext) {
                 if (this.directUpdate) {
@@ -388,7 +389,7 @@ public class CapacitorUpdater {
             }
         } catch (IOException e) {
             e.printStackTrace();
-            final JSObject ret = new JSObject();
+            final Map<String, Object> ret = new HashMap<>();
             ret.put("version", CapacitorUpdater.this.getCurrentBundle().getVersionName());
             CapacitorUpdater.this.notifyListeners("downloadFailed", ret);
             CapacitorUpdater.this.sendStats("download_fail");
@@ -412,7 +413,7 @@ public class CapacitorUpdater {
     }
 
     private void setCurrentBundle(final File bundle) {
-        this.editor.putString(WebView.CAP_SERVER_PATH, bundle.getPath());
+        this.editor.putString(this.CAP_SERVER_PATH, bundle.getPath());
         Log.i(TAG, "Current bundle set to: " + bundle);
         this.editor.commit();
     }
@@ -658,7 +659,7 @@ public class CapacitorUpdater {
                 new okhttp3.Callback() {
                     @Override
                     public void onFailure(@NonNull Call call, @NonNull IOException e) {
-                        JSObject retError = new JSObject();
+                        Map<String, Object> retError = new HashMap<>();
                         retError.put("message", "Request failed: " + e.getMessage());
                         retError.put("error", "network_error");
                         callback.callback(retError);
@@ -668,7 +669,7 @@ public class CapacitorUpdater {
                     public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
                         try (ResponseBody responseBody = response.body()) {
                             if (!response.isSuccessful()) {
-                                JSObject retError = new JSObject();
+                                Map<String, Object> retError = new HashMap<>();
                                 retError.put("message", "Server error: " + response.code());
                                 retError.put("error", "response_error");
                                 callback.callback(retError);
@@ -678,7 +679,7 @@ public class CapacitorUpdater {
                             assert responseBody != null;
                             String responseData = responseBody.string();
                             JSONObject jsonResponse = new JSONObject(responseData);
-                            JSObject ret = new JSObject();
+                            Map<String, Object> ret = new HashMap<>();
 
                             Iterator<String> keys = jsonResponse.keys();
                             while (keys.hasNext()) {
@@ -693,7 +694,7 @@ public class CapacitorUpdater {
                             }
                             callback.callback(ret);
                         } catch (JSONException e) {
-                            JSObject retError = new JSObject();
+                            Map<String, Object> retError = new HashMap<>();
                             retError.put("message", "JSON parse error: " + e.getMessage());
                             retError.put("error", "parse_error");
                             callback.callback(retError);
@@ -712,7 +713,7 @@ public class CapacitorUpdater {
             }
         } catch (JSONException e) {
             Log.e(TAG, "Error getLatest JSONException", e);
-            final JSObject retError = new JSObject();
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
             callback.callback(retError);
@@ -728,7 +729,7 @@ public class CapacitorUpdater {
         String channelUrl = this.channelUrl;
         if (channelUrl == null || channelUrl.isEmpty()) {
             Log.e(TAG, "Channel URL is not set");
-            final JSObject retError = new JSObject();
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "channelUrl missing");
             retError.put("error", "missing_config");
             callback.callback(retError);
@@ -739,7 +740,7 @@ public class CapacitorUpdater {
             json = this.createInfoObject();
         } catch (JSONException e) {
             Log.e(TAG, "Error unsetChannel JSONException", e);
-            final JSObject retError = new JSObject();
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
             callback.callback(retError);
@@ -757,7 +758,7 @@ public class CapacitorUpdater {
                 new okhttp3.Callback() {
                     @Override
                     public void onFailure(@NonNull Call call, @NonNull IOException e) {
-                        JSObject retError = new JSObject();
+                        Map<String, Object> retError = new HashMap<>();
                         retError.put("message", "Request failed: " + e.getMessage());
                         retError.put("error", "network_error");
                         callback.callback(retError);
@@ -767,7 +768,7 @@ public class CapacitorUpdater {
                     public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
                         try (ResponseBody responseBody = response.body()) {
                             if (!response.isSuccessful()) {
-                                JSObject retError = new JSObject();
+                                Map<String, Object> retError = new HashMap<>();
                                 retError.put("message", "Server error: " + response.code());
                                 retError.put("error", "response_error");
                                 callback.callback(retError);
@@ -777,7 +778,7 @@ public class CapacitorUpdater {
                             assert responseBody != null;
                             String responseData = responseBody.string();
                             JSONObject jsonResponse = new JSONObject(responseData);
-                            JSObject ret = new JSObject();
+                            Map<String, Object> ret = new HashMap<>();
 
                             Iterator<String> keys = jsonResponse.keys();
                             while (keys.hasNext()) {
@@ -789,7 +790,7 @@ public class CapacitorUpdater {
                             Log.i(TAG, "Channel unset");
                             callback.callback(ret);
                         } catch (JSONException e) {
-                            JSObject retError = new JSObject();
+                            Map<String, Object> retError = new HashMap<>();
                             retError.put("message", "JSON parse error: " + e.getMessage());
                             retError.put("error", "parse_error");
                             callback.callback(retError);
@@ -803,7 +804,7 @@ public class CapacitorUpdater {
         String channelUrl = this.channelUrl;
         if (channelUrl == null || channelUrl.isEmpty()) {
             Log.e(TAG, "Channel URL is not set");
-            final JSObject retError = new JSObject();
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "channelUrl missing");
             retError.put("error", "missing_config");
             callback.callback(retError);
@@ -815,7 +816,7 @@ public class CapacitorUpdater {
             json.put("channel", channel);
         } catch (JSONException e) {
             Log.e(TAG, "Error setChannel JSONException", e);
-            final JSObject retError = new JSObject();
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
             callback.callback(retError);
@@ -829,7 +830,7 @@ public class CapacitorUpdater {
         String channelUrl = this.channelUrl;
         if (channelUrl == null || channelUrl.isEmpty()) {
             Log.e(TAG, "Channel URL is not set");
-            final JSObject retError = new JSObject();
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Channel URL is not set");
             retError.put("error", "missing_config");
             callback.callback(retError);
@@ -840,7 +841,7 @@ public class CapacitorUpdater {
             json = this.createInfoObject();
         } catch (JSONException e) {
             Log.e(TAG, "Error getChannel JSONException", e);
-            final JSObject retError = new JSObject();
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
             callback.callback(retError);
@@ -858,7 +859,7 @@ public class CapacitorUpdater {
                 new okhttp3.Callback() {
                     @Override
                     public void onFailure(@NonNull Call call, @NonNull IOException e) {
-                        JSObject retError = new JSObject();
+                        Map<String, Object> retError = new HashMap<>();
                         retError.put("message", "Request failed: " + e.getMessage());
                         retError.put("error", "network_error");
                         callback.callback(retError);
@@ -871,7 +872,7 @@ public class CapacitorUpdater {
                                 assert responseBody != null;
                                 String data = responseBody.string();
                                 if (data.contains("channel_not_found") && !defaultChannel.isEmpty()) {
-                                    JSObject ret = new JSObject();
+                                    Map<String, Object> ret = new HashMap<>();
                                     ret.put("channel", defaultChannel);
                                     ret.put("status", "default");
                                     Log.i(TAG, "Channel get to \"" + ret);
@@ -881,7 +882,7 @@ public class CapacitorUpdater {
                             }
 
                             if (!response.isSuccessful()) {
-                                JSObject retError = new JSObject();
+                                Map<String, Object> retError = new HashMap<>();
                                 retError.put("message", "Server error: " + response.code());
                                 retError.put("error", "response_error");
                                 callback.callback(retError);
@@ -891,7 +892,7 @@ public class CapacitorUpdater {
                             assert responseBody != null;
                             String responseData = responseBody.string();
                             JSONObject jsonResponse = new JSONObject(responseData);
-                            JSObject ret = new JSObject();
+                            Map<String, Object> ret = new HashMap<>();
 
                             Iterator<String> keys = jsonResponse.keys();
                             while (keys.hasNext()) {
@@ -903,7 +904,7 @@ public class CapacitorUpdater {
                             Log.i(TAG, "Channel get to \"" + ret);
                             callback.callback(ret);
                         } catch (JSONException e) {
-                            JSObject retError = new JSObject();
+                            Map<String, Object> retError = new HashMap<>();
                             retError.put("message", "JSON parse error: " + e.getMessage());
                             retError.put("error", "parse_error");
                             callback.callback(retError);
@@ -1039,7 +1040,7 @@ public class CapacitorUpdater {
     }
 
     public String getCurrentBundlePath() {
-        String path = this.prefs.getString(WebView.CAP_SERVER_PATH, "public");
+        String path = this.prefs.getString(this.CAP_SERVER_PATH, "public");
         if (path.trim().isEmpty()) {
             return "public";
         }

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

@@ -36,6 +36,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -58,7 +59,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String statsUrlDefault = "https://plugin.capgo.app/stats";
     private static final String channelUrlDefault = "https://plugin.capgo.app/channel_self";
 
-    private final String PLUGIN_VERSION = "7.2.19";
+    private final String PLUGIN_VERSION = "7.2.20";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -89,6 +90,14 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
     private DelayUpdateUtils delayUpdateUtils;
 
+    private JSObject mapToJSObject(Map<String, Object> map) {
+        JSObject jsObject = new JSObject();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            jsObject.put(entry.getKey(), entry.getValue());
+        }
+        return jsObject;
+    }
+
     public Thread startNewThread(final Runnable function, Number waitTime) {
         Thread bgTask = new Thread(() -> {
             try {
@@ -128,13 +137,14 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 }
 
                 @Override
-                public void notifyListeners(final String id, final JSObject res) {
-                    CapacitorUpdaterPlugin.this.notifyListeners(id, res);
+                public void notifyListeners(final String id, final Map<String, Object> res) {
+                    CapacitorUpdaterPlugin.this.notifyListeners(id, CapacitorUpdaterPlugin.this.mapToJSObject(res));
                 }
             };
             final PackageInfo pInfo = this.getContext().getPackageManager().getPackageInfo(this.getContext().getPackageName(), 0);
             this.implementation.activity = this.getActivity();
             this.implementation.versionBuild = this.getConfig().getString("version", pInfo.versionName);
+            this.implementation.CAP_SERVER_PATH = WebView.CAP_SERVER_PATH;
             this.implementation.PLUGIN_VERSION = this.PLUGIN_VERSION;
             this.implementation.versionCode = Integer.toString(pInfo.versionCode);
             this.implementation.client = new OkHttpClient.Builder()
@@ -235,7 +245,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private void sendReadyToJs(final BundleInfo current, final String msg) {
         Log.i(CapacitorUpdater.TAG, "sendReadyToJs");
         final JSObject ret = new JSObject();
-        ret.put("bundle", current.toJSON());
+        ret.put("bundle", mapToJSObject(current.toJSONMap()));
         ret.put("status", msg);
         startNewThread(() -> {
             Log.i(CapacitorUpdater.TAG, "semaphoreReady sendReadyToJs");
@@ -286,7 +296,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             final JSObject ret = new JSObject();
             ret.put("percent", percent);
             final BundleInfo bundleInfo = this.implementation.getBundleInfo(id);
-            ret.put("bundle", bundleInfo.toJSON());
+            ret.put("bundle", mapToJSObject(bundleInfo.toJSONMap()));
             this.notifyListeners("download", ret);
 
             if (percent == 100) {
@@ -412,14 +422,15 @@ public class CapacitorUpdaterPlugin extends Plugin {
             Log.i(CapacitorUpdater.TAG, "unsetChannel triggerAutoUpdate: " + triggerAutoUpdate);
             startNewThread(() ->
                 CapacitorUpdaterPlugin.this.implementation.unsetChannel(res -> {
-                        if (res.has("error")) {
-                            call.reject(res.getString("error"));
+                        JSObject jsRes = mapToJSObject(res);
+                        if (jsRes.has("error")) {
+                            call.reject(jsRes.getString("error"));
                         } else {
                             if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
                                 Log.i(CapacitorUpdater.TAG, "Calling autoupdater after channel change!");
                                 backgroundDownload();
                             }
-                            call.resolve(res);
+                            call.resolve(jsRes);
                         }
                     })
             );
@@ -443,14 +454,15 @@ public class CapacitorUpdaterPlugin extends Plugin {
             Log.i(CapacitorUpdater.TAG, "setChannel " + channel + " triggerAutoUpdate: " + triggerAutoUpdate);
             startNewThread(() ->
                 CapacitorUpdaterPlugin.this.implementation.setChannel(channel, res -> {
-                        if (res.has("error")) {
-                            call.reject(res.getString("error"));
+                        JSObject jsRes = mapToJSObject(res);
+                        if (jsRes.has("error")) {
+                            call.reject(jsRes.getString("error"));
                         } else {
                             if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
                                 Log.i(CapacitorUpdater.TAG, "Calling autoupdater after channel change!");
                                 backgroundDownload();
                             }
-                            call.resolve(res);
+                            call.resolve(jsRes);
                         }
                     })
             );
@@ -466,10 +478,11 @@ public class CapacitorUpdaterPlugin extends Plugin {
             Log.i(CapacitorUpdater.TAG, "getChannel");
             startNewThread(() ->
                 CapacitorUpdaterPlugin.this.implementation.getChannel(res -> {
-                        if (res.has("error")) {
-                            call.reject(res.getString("error"));
+                        JSObject jsRes = mapToJSObject(res);
+                        if (jsRes.has("error")) {
+                            call.reject(jsRes.getString("error"));
                         } else {
-                            call.resolve(res);
+                            call.resolve(jsRes);
                         }
                     })
             );
@@ -503,7 +516,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     if (downloaded.isErrorStatus()) {
                         throw new RuntimeException("Download failed: " + downloaded.getStatus());
                     } else {
-                        call.resolve(downloaded.toJSON());
+                        call.resolve(mapToJSObject(downloaded.toJSONMap()));
                     }
                 } catch (final Exception e) {
                     Log.e(CapacitorUpdater.TAG, "Failed to download from: " + url, e);
@@ -625,7 +638,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 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 {
-                call.resolve(this.implementation.getBundleInfo(id).toJSON());
+                call.resolve(mapToJSObject(this.implementation.getBundleInfo(id).toJSONMap()));
             }
         } catch (final Exception e) {
             Log.e(CapacitorUpdater.TAG, "Could not set next id " + id, e);
@@ -686,7 +699,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             final JSObject ret = new JSObject();
             final JSArray values = new JSArray();
             for (final BundleInfo bundle : res) {
-                values.put(bundle.toJSON());
+                values.put(mapToJSObject(bundle.toJSONMap()));
             }
             ret.put("bundles", values);
             call.resolve(ret);
@@ -701,28 +714,16 @@ public class CapacitorUpdaterPlugin extends Plugin {
         final String channel = call.getString("channel");
         startNewThread(() ->
             CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, channel, res -> {
-                    if (res.has("error")) {
-                        call.reject(res.getString("error"));
+                    JSObject jsRes = mapToJSObject(res);
+                    if (jsRes.has("error")) {
+                        call.reject(jsRes.getString("error"));
                         return;
-                    } else if (res.has("message")) {
-                        call.reject(res.getString("message"));
+                    } else if (jsRes.has("message")) {
+                        call.reject(jsRes.getString("message"));
                         return;
                     } else {
-                        call.resolve(res);
-                    }
-                    final JSObject ret = new JSObject();
-                    Iterator<String> keys = res.keys();
-                    while (keys.hasNext()) {
-                        String key = keys.next();
-                        if (res.has(key)) {
-                            try {
-                                ret.put(key, res.get(key));
-                            } catch (JSONException e) {
-                                e.printStackTrace();
-                            }
-                        }
+                        call.resolve(jsRes);
                     }
-                    call.resolve(ret);
                 })
         );
     }
@@ -761,7 +762,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         try {
             final JSObject ret = new JSObject();
             final BundleInfo bundle = this.implementation.getCurrentBundle();
-            ret.put("bundle", bundle.toJSON());
+            ret.put("bundle", mapToJSObject(bundle.toJSONMap()));
             ret.put("native", this.currentVersionNative);
             call.resolve(ret);
         } catch (final Exception e) {
@@ -779,7 +780,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 return;
             }
 
-            call.resolve(bundle.toJSON());
+            call.resolve(mapToJSObject(bundle.toJSONMap()));
         } catch (final Exception e) {
             Log.e(CapacitorUpdater.TAG, "Could not get next bundle", e);
             call.reject("Could not get next bundle", e);
@@ -797,10 +798,11 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 public void run() {
                     try {
                         CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, null, res -> {
-                                if (res.has("error")) {
-                                    Log.e(CapacitorUpdater.TAG, Objects.requireNonNull(res.getString("error")));
-                                } else if (res.has("version")) {
-                                    String newVersion = res.getString("version");
+                                JSObject jsRes = mapToJSObject(res);
+                                if (jsRes.has("error")) {
+                                    Log.e(CapacitorUpdater.TAG, Objects.requireNonNull(jsRes.getString("error")));
+                                } else if (jsRes.has("version")) {
+                                    String newVersion = jsRes.getString("version");
                                     String currentVersion = String.valueOf(CapacitorUpdaterPlugin.this.implementation.getCurrentBundle());
                                     if (!Objects.equals(newVersion, currentVersion)) {
                                         Log.i(CapacitorUpdater.TAG, "New version found: " + newVersion);
@@ -828,7 +830,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             this.semaphoreDown();
             Log.i(CapacitorUpdater.TAG, "semaphoreReady countDown done");
             final JSObject ret = new JSObject();
-            ret.put("bundle", bundle.toJSON());
+            ret.put("bundle", mapToJSObject(bundle.toJSONMap()));
             call.resolve(ret);
         } catch (final Exception e) {
             Log.e(CapacitorUpdater.TAG, "Failed to notify app ready state. [Error calling 'notifyAppReady()']", e);
@@ -950,7 +952,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             this.notifyListeners("downloadFailed", ret);
         }
         final JSObject ret = new JSObject();
-        ret.put("bundle", current.toJSON());
+        ret.put("bundle", mapToJSObject(current.toJSONMap()));
         this.notifyListeners("noNeedUpdate", ret);
         this.sendReadyToJs(current, msg);
         this.backgroundDownloadTask = null;
@@ -964,17 +966,18 @@ public class CapacitorUpdaterPlugin extends Plugin {
         return startNewThread(() -> {
             Log.i(CapacitorUpdater.TAG, "Check for update via: " + CapacitorUpdaterPlugin.this.updateUrl);
             CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, null, res -> {
+                    JSObject jsRes = mapToJSObject(res);
                     final BundleInfo current = CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
                     try {
-                        if (res.has("message")) {
-                            Log.i(CapacitorUpdater.TAG, "API message: " + res.get("message"));
-                            if (res.has("major") && res.getBoolean("major") && res.has("version")) {
+                        if (jsRes.has("message")) {
+                            Log.i(CapacitorUpdater.TAG, "API message: " + jsRes.get("message"));
+                            if (jsRes.has("major") && jsRes.getBoolean("major") && jsRes.has("version")) {
                                 final JSObject majorAvailable = new JSObject();
-                                majorAvailable.put("version", res.getString("version"));
+                                majorAvailable.put("version", jsRes.getString("version"));
                                 CapacitorUpdaterPlugin.this.notifyListeners("majorAvailable", majorAvailable);
                             }
                             CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
-                                    res.getString("message"),
+                                    jsRes.getString("message"),
                                     current.getVersionName(),
                                     current,
                                     true
@@ -982,7 +985,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                             return;
                         }
 
-                        final String latestVersionName = res.getString("version");
+                        final String latestVersionName = jsRes.getString("version");
 
                         if ("builtin".equals(latestVersionName)) {
                             Log.i(CapacitorUpdater.TAG, "Latest version is builtin");
@@ -1008,7 +1011,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                             return;
                         }
 
-                        if (!res.has("url") || !CapacitorUpdaterPlugin.this.isValidURL(res.getString("url"))) {
+                        if (!jsRes.has("url") || !CapacitorUpdaterPlugin.this.isValidURL(jsRes.getString("url"))) {
                             Log.e(CapacitorUpdater.TAG, "Error no url or wrong format");
                             CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
                                     "Error no url or wrong format",
@@ -1025,7 +1028,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                             final BundleInfo latest = CapacitorUpdaterPlugin.this.implementation.getBundleInfoByName(latestVersionName);
                             if (latest != null) {
                                 final JSObject ret = new JSObject();
-                                ret.put("bundle", latest.toJSON());
+                                ret.put("bundle", mapToJSObject(latest.toJSONMap()));
                                 if (latest.isErrorStatus()) {
                                     Log.e(CapacitorUpdater.TAG, "Latest bundle already exists, and is in error state. Aborting update.");
                                     CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
@@ -1103,13 +1106,13 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                         messageUpdate
                                     );
 
-                                    final String url = res.getString("url");
-                                    final String sessionKey = res.has("sessionKey") ? res.getString("sessionKey") : "";
-                                    final String checksum = res.has("checksum") ? res.getString("checksum") : "";
+                                    final String url = jsRes.getString("url");
+                                    final String sessionKey = jsRes.has("sessionKey") ? jsRes.getString("sessionKey") : "";
+                                    final String checksum = jsRes.has("checksum") ? jsRes.getString("checksum") : "";
 
-                                    if (res.has("manifest")) {
+                                    if (jsRes.has("manifest")) {
                                         // Handle manifest-based download
-                                        JSONArray manifest = res.getJSONArray("manifest");
+                                        JSONArray manifest = jsRes.getJSONArray("manifest");
                                         CapacitorUpdaterPlugin.this.implementation.downloadBackground(
                                                 url,
                                                 latestVersionName,
@@ -1196,7 +1199,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             Log.e(CapacitorUpdater.TAG, "notifyAppReady was not called, roll back current bundle: " + current.getId());
             Log.i(CapacitorUpdater.TAG, "Did you forget to call 'notifyAppReady()' in your Capacitor App code?");
             final JSObject ret = new JSObject();
-            ret.put("bundle", current.toJSON());
+            ret.put("bundle", mapToJSObject(current.toJSONMap()));
             this.notifyListeners("updateFailed", ret);
             this.implementation.sendStats("update_fail", current.getVersionName());
             this.implementation.setError(current);

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -45,7 +45,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "getNextBundle", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "7.2.19"
+    private let PLUGIN_VERSION: String = "7.2.20"
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
     static let channelUrlDefault = "https://plugin.capgo.app/channel_self"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "7.2.19",
+  "version": "7.2.20",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",