@capgo/capacitor-updater 8.0.1 → 8.2.0

package/android/src/main/java/ee/forgr/capacitor_updater/{CapacitorUpdater.java → CapgoUpdater.java}

@@ -10,14 +10,11 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
-import android.util.Log;
 import androidx.annotation.NonNull;
 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,17 +27,28 @@ 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.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import okhttp3.*;
+import okhttp3.HttpUrl;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class CapacitorUpdater {
+public class CapgoUpdater {
+
+    private final Logger logger;
 
     private static final String AB = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
     private static final SecureRandom rnd = new SecureRandom();
@@ -55,15 +63,14 @@ public class CapacitorUpdater {
     public SharedPreferences.Editor editor;
     public SharedPreferences prefs;
 
-    public OkHttpClient client;
-
     public File documentsDir;
     public Boolean directUpdate = false;
     public Activity activity;
-    public String PLUGIN_VERSION = "";
+    public String pluginVersion = "";
     public String versionBuild = "";
     public String versionCode = "";
     public String versionOs = "";
+    public String CAP_SERVER_PATH = "";
 
     public String customId = "";
     public String statsUrl = "";
@@ -74,6 +81,22 @@ public class CapacitorUpdater {
     public String deviceID = "";
     public int timeout = 20000;
 
+    // Cached key ID calculated once from publicKey
+    private String cachedKeyId = "";
+
+    // Flag to track if we received a 429 response - stops requests until app restart
+    private static volatile boolean rateLimitExceeded = false;
+
+    // Flag to track if we've already sent the rate limit statistic - prevents infinite loop
+    private static volatile boolean rateLimitStatisticSent = false;
+
+    private final Map<String, CompletableFuture<BundleInfo>> downloadFutures = new ConcurrentHashMap<>();
+    private final ExecutorService io = Executors.newSingleThreadExecutor();
+
+    public CapgoUpdater(Logger logger) {
+        this.logger = logger;
+    }
+
     private final FilenameFilter filter = (f, name) -> {
         // ignore directories generated by mac os x
         return (!name.startsWith("__MACOSX") && !name.startsWith(".") && !name.startsWith(".DS_Store"));
@@ -117,14 +140,27 @@ 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() {
+    public String randomString() {
         final StringBuilder sb = new StringBuilder(10);
         for (int i = 0; i < 10; i++) sb.append(AB.charAt(rnd.nextInt(AB.length())));
         return sb.toString();
     }
 
+    public void setPublicKey(String publicKey) {
+        this.publicKey = publicKey;
+        if (!publicKey.isEmpty()) {
+            this.cachedKeyId = CryptoCipher.calcKeyId(publicKey);
+        } else {
+            this.cachedKeyId = "";
+        }
+    }
+
+    public String getKeyId() {
+        return this.cachedKeyId;
+    }
+
     private File unzip(final String id, final File zipFile, final String dest) throws IOException {
         final File targetDirectory = new File(this.documentsDir, dest);
         try (
@@ -142,7 +178,7 @@ public class CapacitorUpdater {
             ZipEntry entry;
             while ((entry = zis.getNextEntry()) != null) {
                 if (entry.getName().contains("\\")) {
-                    Log.e(TAG, "unzip: Windows path is not supported, please use unix path as require by zip RFC: " + entry.getName());
+                    logger.error("unzip: Windows path is not supported, please use unix path as require by zip RFC: " + entry.getName());
                     this.sendStats("windows_path_fail");
                 }
                 final File file = new File(targetDirectory, entry.getName());
@@ -207,14 +243,14 @@ public class CapacitorUpdater {
 
     private void observeWorkProgress(Context context, String id) {
         if (!(context instanceof LifecycleOwner)) {
-            Log.e(TAG, "Context is not a LifecycleOwner, cannot observe work progress");
+            logger.error("Context is not a LifecycleOwner, cannot observe work progress");
             return;
         }
 
         activity.runOnUiThread(() -> {
             WorkManager.getInstance(context)
                 .getWorkInfosByTagLiveData(id)
-                .observe((LifecycleOwner) context, workInfos -> {
+                .observe((LifecycleOwner) context, (workInfos) -> {
                     if (workInfos == null || workInfos.isEmpty()) return;
 
                     WorkInfo workInfo = workInfos.get(0);
@@ -226,6 +262,7 @@ public class CapacitorUpdater {
                             notifyDownload(id, percent);
                             break;
                         case SUCCEEDED:
+                            logger.info("Download succeeded: " + workInfo.getState());
                             Data outputData = workInfo.getOutputData();
                             String dest = outputData.getString(DownloadService.FILEDEST);
                             String version = outputData.getString(DownloadService.VERSION);
@@ -233,35 +270,71 @@ public class CapacitorUpdater {
                             String checksum = outputData.getString(DownloadService.CHECKSUM);
                             boolean isManifest = outputData.getBoolean(DownloadService.IS_MANIFEST, false);
 
-                            boolean success = finishDownload(id, dest, version, sessionKey, checksum, true, isManifest);
-                            if (!success) {
-                                saveBundleInfo(
-                                    id,
-                                    new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "")
-                                );
-                                JSObject ret = new JSObject();
-                                ret.put("version", getCurrentBundle().getVersionName());
-                                ret.put("error", "finish_download_fail");
-                                sendStats("finish_download_fail", version);
-                                notifyListeners("downloadFailed", ret);
-                            }
+                            io.execute(() -> {
+                                boolean success = finishDownload(id, dest, version, sessionKey, checksum, true, isManifest);
+                                BundleInfo resultBundle;
+                                if (!success) {
+                                    logger.error("Finish download failed: " + version);
+                                    resultBundle = new BundleInfo(
+                                        id,
+                                        version,
+                                        BundleStatus.ERROR,
+                                        new Date(System.currentTimeMillis()),
+                                        ""
+                                    );
+                                    saveBundleInfo(id, resultBundle);
+                                    // Cleanup download tracking
+                                    DownloadWorkerManager.cancelBundleDownload(activity, id, version);
+                                    Map<String, Object> ret = new HashMap<>();
+                                    ret.put("version", version);
+                                    ret.put("error", "finish_download_fail");
+                                    sendStats("finish_download_fail", version);
+                                    notifyListeners("downloadFailed", ret);
+                                } else {
+                                    // Successful download - cleanup tracking
+                                    DownloadWorkerManager.cancelBundleDownload(activity, id, version);
+                                    resultBundle = getBundleInfo(id);
+                                }
+
+                                // Complete the future if it exists
+                                CompletableFuture<BundleInfo> future = downloadFutures.remove(id);
+                                if (future != null) {
+                                    future.complete(resultBundle);
+                                }
+                            });
                             break;
                         case FAILED:
                             Data failedData = workInfo.getOutputData();
                             String error = failedData.getString(DownloadService.ERROR);
+                            logger.error("Download failed: " + error + " " + workInfo.getState());
                             String failedVersion = failedData.getString(DownloadService.VERSION);
-                            saveBundleInfo(
-                                id,
-                                new BundleInfo(id, failedVersion, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "")
-                            );
-                            JSObject ret = new JSObject();
-                            ret.put("version", getCurrentBundle().getVersionName());
-                            if ("low_mem_fail".equals(error)) {
-                                sendStats("low_mem_fail", failedVersion);
-                            }
-                            ret.put("error", error != null ? error : "download_fail");
-                            sendStats("download_fail", failedVersion);
-                            notifyListeners("downloadFailed", ret);
+
+                            io.execute(() -> {
+                                BundleInfo failedBundle = new BundleInfo(
+                                    id,
+                                    failedVersion,
+                                    BundleStatus.ERROR,
+                                    new Date(System.currentTimeMillis()),
+                                    ""
+                                );
+                                saveBundleInfo(id, failedBundle);
+                                // Cleanup download tracking for failed downloads
+                                DownloadWorkerManager.cancelBundleDownload(activity, id, failedVersion);
+                                Map<String, Object> ret = new HashMap<>();
+                                ret.put("version", failedVersion);
+                                if ("low_mem_fail".equals(error)) {
+                                    sendStats("low_mem_fail", failedVersion);
+                                }
+                                ret.put("error", error != null ? error : "download_fail");
+                                sendStats("download_fail", failedVersion);
+                                notifyListeners("downloadFailed", ret);
+
+                                // Complete the future with error status
+                                CompletableFuture<BundleInfo> failedFuture = downloadFutures.remove(id);
+                                if (failedFuture != null) {
+                                    failedFuture.complete(failedBundle);
+                                }
+                            });
                             break;
                     }
                 });
@@ -278,7 +351,7 @@ public class CapacitorUpdater {
         final JSONArray manifest
     ) {
         if (this.activity == null) {
-            Log.e(TAG, "Activity is null, cannot observe work progress");
+            logger.error("Activity is null, cannot observe work progress");
             return;
         }
         observeWorkProgress(this.activity, id);
@@ -293,7 +366,18 @@ public class CapacitorUpdater {
             sessionKey,
             checksum,
             this.publicKey,
-            manifest != null
+            manifest != null,
+            this.isEmulator(),
+            this.appId,
+            this.pluginVersion,
+            this.isProd(),
+            this.statsUrl,
+            this.deviceID,
+            this.versionBuild,
+            this.versionCode,
+            this.versionOs,
+            this.customId,
+            this.defaultChannel
         );
 
         if (manifest != null) {
@@ -311,6 +395,7 @@ public class CapacitorUpdater {
         Boolean isManifest
     ) {
         File downloaded = null;
+        File extractedDir = null;
         String checksum = "";
 
         try {
@@ -319,68 +404,94 @@ public class CapacitorUpdater {
 
             if (!isManifest) {
                 String checksumDecrypted = Objects.requireNonNullElse(checksumRes, "");
+
+                // If public key is present but no checksum provided, refuse installation
+                if (!this.publicKey.isEmpty() && checksumDecrypted.isEmpty()) {
+                    logger.error("Public key present but no checksum provided");
+                    this.sendStats("checksum_required");
+                    throw new IOException("Checksum required when public key is present: " + id);
+                }
+
                 if (!sessionKey.isEmpty()) {
-                    CryptoCipherV2.decryptFile(downloaded, publicKey, sessionKey);
-                    checksumDecrypted = CryptoCipherV2.decryptChecksum(checksumRes, publicKey);
-                    checksum = CryptoCipherV2.calcChecksum(downloaded);
+                    CryptoCipher.decryptFile(downloaded, publicKey, sessionKey);
+                    checksumDecrypted = CryptoCipher.decryptChecksum(checksumRes, publicKey);
+                    checksum = CryptoCipher.calcChecksum(downloaded);
+                } else {
+                    checksum = CryptoCipher.calcChecksum(downloaded);
                 }
+                CryptoCipher.logChecksumInfo("Calculated checksum", checksum);
+                CryptoCipher.logChecksumInfo("Expected checksum", checksumDecrypted);
                 if ((!checksumDecrypted.isEmpty() || !this.publicKey.isEmpty()) && !checksumDecrypted.equals(checksum)) {
-                    Log.e(CapacitorUpdater.TAG, "Error checksum '" + checksumDecrypted + "' '" + checksum + "' '");
+                    logger.error("Error checksum '" + checksumDecrypted + "' '" + checksum + "' '");
                     this.sendStats("checksum_fail");
                     throw new IOException("Checksum failed: " + id);
                 }
             }
             // Remove the decryption for manifest downloads
-        } catch (IOException e) {
+        } catch (Exception e) {
+            if (!isManifest) {
+                safeDelete(downloaded);
+            }
             final Boolean res = this.delete(id);
             if (!res) {
-                Log.i(CapacitorUpdater.TAG, "Double error, cannot cleanup: " + version);
+                logger.info("Double error, cannot cleanup: " + version);
             }
 
-            final JSObject ret = new JSObject();
-            ret.put("version", CapacitorUpdater.this.getCurrentBundle().getVersionName());
+            final Map<String, Object> ret = new HashMap<>();
+            ret.put("version", version);
 
-            CapacitorUpdater.this.notifyListeners("downloadFailed", ret);
-            CapacitorUpdater.this.sendStats("download_fail");
+            CapgoUpdater.this.notifyListeners("downloadFailed", ret);
+            CapgoUpdater.this.sendStats("download_fail");
             return false;
         }
 
         try {
             if (!isManifest) {
-                final File unzipped = this.unzip(id, downloaded, this.randomString());
+                extractedDir = this.unzip(id, downloaded, this.randomString());
                 this.notifyDownload(id, 91);
                 final String idName = bundleDirectory + "/" + id;
-                this.flattenAssets(unzipped, idName);
+                this.flattenAssets(extractedDir, idName);
             } else {
                 this.notifyDownload(id, 91);
                 final String idName = bundleDirectory + "/" + id;
                 this.flattenAssets(downloaded, idName);
                 downloaded.delete();
             }
-            this.notifyDownload(id, 100);
+            // Remove old bundle info and set new one
             this.saveBundleInfo(id, null);
             BundleInfo next = new BundleInfo(id, version, BundleStatus.PENDING, new Date(System.currentTimeMillis()), checksum);
             this.saveBundleInfo(id, next);
+            this.notifyDownload(id, 100);
 
-            final JSObject ret = new JSObject();
-            ret.put("bundle", next.toJSON());
-            CapacitorUpdater.this.notifyListeners("updateAvailable", ret);
+            final Map<String, Object> ret = new HashMap<>();
+            ret.put("bundle", next.toJSONMap());
+            logger.info("updateAvailable: " + ret);
+            CapgoUpdater.this.notifyListeners("updateAvailable", ret);
+            logger.info("setNext: " + setNext);
             if (setNext) {
+                logger.info("directUpdate: " + this.directUpdate);
                 if (this.directUpdate) {
-                    CapacitorUpdater.this.directUpdateFinish(next);
+                    CapgoUpdater.this.directUpdateFinish(next);
                     this.directUpdate = false;
                 } else {
                     this.setNextBundle(next.getId());
                 }
             }
         } catch (IOException e) {
+            if (!isManifest) {
+                safeDelete(extractedDir);
+                safeDelete(downloaded);
+            }
             e.printStackTrace();
-            final JSObject ret = new JSObject();
-            ret.put("version", CapacitorUpdater.this.getCurrentBundle().getVersionName());
-            CapacitorUpdater.this.notifyListeners("downloadFailed", ret);
-            CapacitorUpdater.this.sendStats("download_fail");
+            final Map<String, Object> ret = new HashMap<>();
+            ret.put("version", version);
+            CapgoUpdater.this.notifyListeners("downloadFailed", ret);
+            CapgoUpdater.this.sendStats("download_fail");
             return false;
         }
+        if (!isManifest) {
+            safeDelete(downloaded);
+        }
         return true;
     }
 
@@ -398,9 +509,76 @@ public class CapacitorUpdater {
         }
     }
 
+    public void cleanupDeltaCache() {
+        if (this.activity == null) {
+            logger.warn("Activity is null, skipping delta cache cleanup");
+            return;
+        }
+        final File cacheFolder = new File(this.activity.getCacheDir(), "capgo_downloads");
+        if (!cacheFolder.exists()) {
+            return;
+        }
+        try {
+            this.deleteDirectory(cacheFolder);
+            logger.info("Cleaned up delta cache folder");
+        } catch (IOException e) {
+            logger.error("Failed to cleanup delta cache: " + e.getMessage());
+        }
+    }
+
+    public void cleanupDownloadDirectories(final Set<String> allowedIds) {
+        if (this.documentsDir == null) {
+            logger.warn("Documents directory is null, skipping download cleanup");
+            return;
+        }
+
+        final File bundleRoot = new File(this.documentsDir, bundleDirectory);
+        if (!bundleRoot.exists() || !bundleRoot.isDirectory()) {
+            return;
+        }
+
+        final File[] entries = bundleRoot.listFiles();
+        if (entries != null) {
+            for (final File entry : entries) {
+                if (!entry.isDirectory()) {
+                    continue;
+                }
+
+                final String id = entry.getName();
+
+                if (allowedIds != null && allowedIds.contains(id)) {
+                    continue;
+                }
+
+                try {
+                    this.deleteDirectory(entry);
+                    this.removeBundleInfo(id);
+                    logger.info("Deleted orphan bundle directory: " + id);
+                } catch (IOException e) {
+                    logger.error("Failed to delete orphan bundle directory: " + id + " " + e.getMessage());
+                }
+            }
+        }
+    }
+
+    private void safeDelete(final File target) {
+        if (target == null || !target.exists()) {
+            return;
+        }
+        try {
+            if (target.isDirectory()) {
+                this.deleteDirectory(target);
+            } else if (!target.delete()) {
+                logger.warn("Failed to delete file: " + target.getAbsolutePath());
+            }
+        } catch (IOException cleanupError) {
+            logger.warn("Cleanup failed for " + target.getAbsolutePath() + ": " + cleanupError.getMessage());
+        }
+    }
+
     private void setCurrentBundle(final File bundle) {
-        this.editor.putString(WebView.CAP_SERVER_PATH, bundle.getPath());
-        Log.i(TAG, "Current bundle set to: " + bundle);
+        this.editor.putString(this.CAP_SERVER_PATH, bundle.getPath());
+        logger.info("Current bundle set to: " + bundle);
         this.editor.commit();
     }
 
@@ -413,13 +591,21 @@ public class CapacitorUpdater {
     ) {
         final String id = this.randomString();
 
-        // Check if version is already downloading
-        if (this.activity != null && DownloadWorkerManager.isVersionDownloading(version)) {
-            Log.i(TAG, "Version already downloading: " + version);
-            return;
+        // Check if version is already downloading, but allow retry if previous download failed
+        if (this.activity != null && DownloadWorkerManager.isVersionDownloading(this.activity, version)) {
+            // Check if there's an existing bundle with error status that we can retry
+            BundleInfo existingBundle = this.getBundleInfoByName(version);
+            if (existingBundle != null && existingBundle.isErrorStatus()) {
+                // Cancel the failed download and allow retry
+                DownloadWorkerManager.cancelVersionDownload(this.activity, version);
+                logger.info("Retrying failed download for version: " + version);
+            } else {
+                logger.info("Version already downloading: " + version);
+                return;
+            }
         }
 
-        this.saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.DOWNLOADING, new Date(System.currentTimeMillis()), ""));
+        saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.DOWNLOADING, new Date(System.currentTimeMillis()), ""));
         this.notifyDownload(id, 0);
         this.notifyDownload(id, 5);
 
@@ -427,42 +613,43 @@ public class CapacitorUpdater {
     }
 
     public BundleInfo download(final String url, final String version, final String sessionKey, final String checksum) throws IOException {
+        // Check for existing bundle with same version and clean up if in error state
+        BundleInfo existingBundle = this.getBundleInfoByName(version);
+        if (existingBundle != null && (existingBundle.isErrorStatus() || existingBundle.isDeleted())) {
+            logger.info("Found existing failed bundle for version " + version + ", deleting before retry");
+            this.delete(existingBundle.getId(), true);
+        }
+
         final String id = this.randomString();
-        this.saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.DOWNLOADING, new Date(System.currentTimeMillis()), ""));
+        saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.DOWNLOADING, new Date(System.currentTimeMillis()), ""));
         this.notifyDownload(id, 0);
         this.notifyDownload(id, 5);
         final String dest = this.randomString();
 
-        // Use the new WorkManager-based download
+        // Create a CompletableFuture to track download completion
+        CompletableFuture<BundleInfo> downloadFuture = new CompletableFuture<>();
+        downloadFutures.put(id, downloadFuture);
+
+        // Start the download
         this.download(id, url, dest, version, sessionKey, checksum, null);
 
-        // Wait for completion
+        // Wait for completion without timeout
         try {
-            ListenableFuture<List<WorkInfo>> future = WorkManager.getInstance(activity).getWorkInfosByTag(id);
-
-            List<WorkInfo> workInfos = Futures.getChecked(future, IOException.class);
-
-            if (workInfos != null && !workInfos.isEmpty()) {
-                WorkInfo workInfo = workInfos.get(0);
-                while (!workInfo.getState().isFinished()) {
-                    Thread.sleep(100);
-                    workInfos = Futures.getChecked(WorkManager.getInstance(activity).getWorkInfosByTag(id), IOException.class);
-                    if (workInfos != null && !workInfos.isEmpty()) {
-                        workInfo = workInfos.get(0);
-                    }
-                }
-
-                if (workInfo.getState() != WorkInfo.State.SUCCEEDED) {
-                    Data outputData = workInfo.getOutputData();
-                    String error = outputData.getString(DownloadService.ERROR);
-                    throw new IOException(error != null ? error : "Download failed: " + workInfo.getState());
-                }
+            BundleInfo result = downloadFuture.get();
+            if (result.isErrorStatus()) {
+                throw new IOException("Download failed with status: " + result.getStatus());
             }
-            return getBundleInfo(id);
+            return result;
         } catch (Exception e) {
-            Log.e(TAG, "Error waiting for download", e);
-            saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), ""));
-            throw new IOException("Error waiting for download: " + e.getMessage());
+            // Clean up on failure
+            downloadFutures.remove(id);
+            logger.error("Error waiting for download: " + e.getMessage());
+            BundleInfo errorBundle = new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "");
+            saveBundleInfo(id, errorBundle);
+            if (e instanceof IOException) {
+                throw (IOException) e;
+            }
+            throw new IOException("Error waiting for download: " + e.getMessage(), e);
         }
     }
 
@@ -470,14 +657,14 @@ public class CapacitorUpdater {
         if (!rawList) {
             final List<BundleInfo> res = new ArrayList<>();
             final File destHot = new File(this.documentsDir, bundleDirectory);
-            Log.d(TAG, "list File : " + destHot.getPath());
+            logger.debug("list File : " + destHot.getPath());
             if (destHot.exists()) {
                 for (final File i : Objects.requireNonNull(destHot.listFiles())) {
                     final String id = i.getName();
                     res.add(this.getBundleInfo(id));
                 }
             } else {
-                Log.i(TAG, "No versions available to list" + destHot);
+                logger.info("No versions available to list" + destHot);
             }
             return res;
         } else {
@@ -496,12 +683,12 @@ public class CapacitorUpdater {
     public Boolean delete(final String id, final Boolean removeInfo) throws IOException {
         final BundleInfo deleted = this.getBundleInfo(id);
         if (deleted.isBuiltin() || this.getCurrentBundleId().equals(id)) {
-            Log.e(TAG, "Cannot delete " + id);
+            logger.error("Cannot delete " + id);
             return false;
         }
         final BundleInfo next = this.getNextBundle();
         if (next != null && !next.isDeleted() && !next.isErrorStatus() && next.getId().equals(id)) {
-            Log.e(TAG, "Cannot delete the next bundle" + id);
+            logger.error("Cannot delete the next bundle" + id);
             return false;
         }
         // Cancel download for this version if active
@@ -518,7 +705,7 @@ public class CapacitorUpdater {
             }
             return true;
         }
-        Log.e(TAG, "bundle removed: " + deleted.getVersionName());
+        logger.error("bundle removed: " + deleted.getVersionName());
         // perhaps we did not find the bundle in the files, but if the user requested a delete, we delete
         if (removeInfo) {
             this.removeBundleInfo(id);
@@ -532,7 +719,7 @@ public class CapacitorUpdater {
             return this.delete(id, true);
         } catch (IOException e) {
             e.printStackTrace();
-            Log.i(CapacitorUpdater.TAG, "Failed to delete bundle (" + id + ")" + "\nError:\n" + e.toString());
+            logger.info("Failed to delete bundle (" + id + ")" + "\nError:\n" + e.toString());
             return false;
         }
     }
@@ -558,7 +745,7 @@ public class CapacitorUpdater {
             return true;
         }
         final File bundle = this.getBundleDirectory(id);
-        Log.i(TAG, "Setting next active bundle: " + id);
+        logger.info("Setting next active bundle: " + id);
         if (this.bundleExists(id)) {
             var currentBundleName = this.getCurrentBundle().getVersionName();
             this.setCurrentBundle(bundle);
@@ -574,7 +761,7 @@ public class CapacitorUpdater {
     public void autoReset() {
         final BundleInfo currentBundle = this.getCurrentBundle();
         if (!currentBundle.isBuiltin() && !this.bundleExists(currentBundle.getId())) {
-            Log.i(TAG, "Folder at bundle path does not exist. Triggering reset.");
+            logger.info("Folder at bundle path does not exist. Triggering reset.");
             this.reset();
         }
     }
@@ -586,12 +773,17 @@ public class CapacitorUpdater {
     public void setSuccess(final BundleInfo bundle, Boolean autoDeletePrevious) {
         this.setBundleStatus(bundle.getId(), BundleStatus.SUCCESS);
         final BundleInfo fallback = this.getFallbackBundle();
-        Log.d(CapacitorUpdater.TAG, "Fallback bundle is: " + fallback);
-        Log.i(CapacitorUpdater.TAG, "Version successfully loaded: " + bundle.getVersionName());
-        if (autoDeletePrevious && !fallback.isBuiltin()) {
+        logger.debug("Fallback bundle is: " + fallback);
+        logger.info("Version successfully loaded: " + bundle.getVersionName());
+        // Only attempt to delete when the fallback is a different bundle than the
+        // currently loaded one. Otherwise we spam logs with "Cannot delete <id>"
+        // because delete() protects the current bundle from removal.
+        if (autoDeletePrevious && !fallback.isBuiltin() && fallback.getId() != null && !fallback.getId().equals(bundle.getId())) {
             final Boolean res = this.delete(fallback.getId());
             if (res) {
-                Log.i(CapacitorUpdater.TAG, "Deleted previous bundle: " + fallback.getVersionName());
+                logger.info("Deleted previous bundle: " + fallback.getVersionName());
+            } else {
+                logger.debug("Skip deleting previous bundle (same as current or protected): " + fallback.getId());
             }
         }
         this.setFallbackBundle(bundle);
@@ -602,7 +794,7 @@ public class CapacitorUpdater {
     }
 
     public void reset(final boolean internal) {
-        Log.d(CapacitorUpdater.TAG, "reset: " + internal);
+        logger.debug("reset: " + internal);
         var currentBundleName = this.getCurrentBundle().getVersionName();
         this.setCurrentBundle(new File("public"));
         this.setFallbackBundle(null);
@@ -626,26 +818,85 @@ public class CapacitorUpdater {
         json.put("version_code", this.versionCode);
         json.put("version_os", this.versionOs);
         json.put("version_name", this.getCurrentBundle().getVersionName());
-        json.put("plugin_version", this.PLUGIN_VERSION);
+        json.put("plugin_version", this.pluginVersion);
         json.put("is_emulator", this.isEmulator());
         json.put("is_prod", this.isProd());
         json.put("defaultChannel", this.defaultChannel);
+
+        // Add encryption key ID if encryption is enabled (use cached value)
+        if (!this.cachedKeyId.isEmpty()) {
+            json.put("key_id", this.cachedKeyId);
+        }
+
         return json;
     }
 
+    /**
+     * Check if a 429 (Too Many Requests) response was received and set the flag
+     */
+    private boolean checkAndHandleRateLimitResponse(Response response) {
+        if (response.code() == 429) {
+            // Send a statistic about the rate limit BEFORE setting the flag
+            // Only send once to prevent infinite loop if the stat request itself gets rate limited
+            if (!rateLimitExceeded && !rateLimitStatisticSent) {
+                rateLimitStatisticSent = true;
+                sendRateLimitStatistic();
+            }
+            rateLimitExceeded = true;
+            logger.warn("Rate limit exceeded (429). Stopping all stats and channel requests until app restart.");
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Send a synchronous statistic about rate limiting
+     */
+    private void sendRateLimitStatistic() {
+        String statsUrl = this.statsUrl;
+        if (statsUrl == null || statsUrl.isEmpty()) {
+            return;
+        }
+
+        try {
+            BundleInfo current = this.getCurrentBundle();
+            JSONObject json = this.createInfoObject();
+            json.put("version_name", current.getVersionName());
+            json.put("old_version_name", "");
+            json.put("action", "rate_limit_reached");
+
+            Request request = new Request.Builder()
+                .url(statsUrl)
+                .post(RequestBody.create(json.toString(), MediaType.get("application/json")))
+                .build();
+
+            // Send synchronously to ensure it goes out before the flag is set
+            // User-Agent header is automatically added by DownloadService.sharedClient interceptor
+            try (Response response = DownloadService.sharedClient.newCall(request).execute()) {
+                if (response.isSuccessful()) {
+                    logger.info("Rate limit statistic sent");
+                } else {
+                    logger.error("Error sending rate limit statistic: " + response.code());
+                }
+            }
+        } catch (final Exception e) {
+            logger.error("Failed to send rate limit statistic: " + e.getMessage());
+        }
+    }
+
     private void makeJsonRequest(String url, JSONObject jsonBody, Callback callback) {
         MediaType JSON = MediaType.get("application/json; charset=utf-8");
         RequestBody body = RequestBody.create(jsonBody.toString(), JSON);
 
         Request request = new Request.Builder().url(url).post(body).build();
 
-        client
+        DownloadService.sharedClient
             .newCall(request)
             .enqueue(
                 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);
@@ -654,10 +905,22 @@ public class CapacitorUpdater {
                     @Override
                     public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
                         try (ResponseBody responseBody = response.body()) {
+                            final int statusCode = response.code();
+                            // Check for 429 rate limit
+                            if (checkAndHandleRateLimitResponse(response)) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", "Rate limit exceeded");
+                                retError.put("error", "rate_limit_exceeded");
+                                retError.put("statusCode", statusCode);
+                                callback.callback(retError);
+                                return;
+                            }
+
                             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");
+                                retError.put("statusCode", statusCode);
                                 callback.callback(retError);
                                 return;
                             }
@@ -665,7 +928,23 @@ public class CapacitorUpdater {
                             assert responseBody != null;
                             String responseData = responseBody.string();
                             JSONObject jsonResponse = new JSONObject(responseData);
-                            JSObject ret = new JSObject();
+
+                            // Check for server-side errors first
+                            if (jsonResponse.has("error")) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("error", jsonResponse.getString("error"));
+                                if (jsonResponse.has("message")) {
+                                    retError.put("message", jsonResponse.getString("message"));
+                                } else {
+                                    retError.put("message", "server did not provide a message");
+                                }
+                                retError.put("statusCode", statusCode);
+                                callback.callback(retError);
+                                return;
+                            }
+
+                            Map<String, Object> ret = new HashMap<>();
+                            ret.put("statusCode", statusCode);
 
                             Iterator<String> keys = jsonResponse.keys();
                             while (keys.hasNext()) {
@@ -680,7 +959,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);
@@ -698,24 +977,68 @@ public class CapacitorUpdater {
                 json.put("defaultChannel", channel);
             }
         } catch (JSONException e) {
-            Log.e(TAG, "Error getLatest JSONException", e);
-            final JSObject retError = new JSObject();
+            logger.error("Error getLatest JSONException " + e.getMessage());
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
             callback.callback(retError);
             return;
         }
 
-        Log.i(CapacitorUpdater.TAG, "Auto-update parameters: " + json);
+        logger.info("Auto-update parameters: " + json);
 
         makeJsonRequest(updateUrl, json, callback);
     }
 
-    public void unsetChannel(final Callback callback) {
+    public void unsetChannel(
+        final SharedPreferences.Editor editor,
+        final String defaultChannelKey,
+        final String configDefaultChannel,
+        final Callback callback
+    ) {
+        // Clear persisted defaultChannel and revert to config value
+        editor.remove(defaultChannelKey);
+        editor.apply();
+        this.defaultChannel = configDefaultChannel;
+        logger.info("Persisted defaultChannel cleared, reverted to config value: " + configDefaultChannel);
+
+        Map<String, Object> ret = new HashMap<>();
+        ret.put("status", "ok");
+        ret.put("message", "Channel override removed");
+        callback.callback(ret);
+    }
+
+    public void setChannel(
+        final String channel,
+        final SharedPreferences.Editor editor,
+        final String defaultChannelKey,
+        final boolean allowSetDefaultChannel,
+        final Callback callback
+    ) {
+        // Check if setting defaultChannel is allowed
+        if (!allowSetDefaultChannel) {
+            logger.error("setChannel is disabled by allowSetDefaultChannel config");
+            final Map<String, Object> retError = new HashMap<>();
+            retError.put("message", "setChannel is disabled by configuration");
+            retError.put("error", "disabled_by_config");
+            callback.callback(retError);
+            return;
+        }
+
+        // Check if rate limit was exceeded
+        if (rateLimitExceeded) {
+            logger.debug("Skipping setChannel due to rate limit (429). Requests will resume after app restart.");
+            final Map<String, Object> retError = new HashMap<>();
+            retError.put("message", "Rate limit exceeded");
+            retError.put("error", "rate_limit_exceeded");
+            callback.callback(retError);
+            return;
+        }
+
         String channelUrl = this.channelUrl;
         if (channelUrl == null || channelUrl.isEmpty()) {
-            Log.e(TAG, "Channel URL is not set");
-            final JSObject retError = new JSObject();
+            logger.error("Channel URL is not set");
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "channelUrl missing");
             retError.put("error", "missing_config");
             callback.callback(retError);
@@ -724,9 +1047,56 @@ public class CapacitorUpdater {
         JSONObject json;
         try {
             json = this.createInfoObject();
+            json.put("channel", channel);
         } catch (JSONException e) {
-            Log.e(TAG, "Error unsetChannel JSONException", e);
-            final JSObject retError = new JSObject();
+            logger.error("Error setChannel JSONException " + e.getMessage());
+            final Map<String, Object> retError = new HashMap<>();
+            retError.put("message", "Cannot get info: " + e);
+            retError.put("error", "json_error");
+            callback.callback(retError);
+            return;
+        }
+
+        makeJsonRequest(channelUrl, json, (res) -> {
+            if (res.containsKey("error")) {
+                callback.callback(res);
+            } else {
+                // Success - persist defaultChannel
+                this.defaultChannel = channel;
+                editor.putString(defaultChannelKey, channel);
+                editor.apply();
+                logger.info("defaultChannel persisted locally: " + channel);
+                callback.callback(res);
+            }
+        });
+    }
+
+    public void getChannel(final Callback callback) {
+        // Check if rate limit was exceeded
+        if (rateLimitExceeded) {
+            logger.debug("Skipping getChannel due to rate limit (429). Requests will resume after app restart.");
+            final Map<String, Object> retError = new HashMap<>();
+            retError.put("message", "Rate limit exceeded");
+            retError.put("error", "rate_limit_exceeded");
+            callback.callback(retError);
+            return;
+        }
+
+        String channelUrl = this.channelUrl;
+        if (channelUrl == null || channelUrl.isEmpty()) {
+            logger.error("Channel URL is not set");
+            final Map<String, Object> retError = new HashMap<>();
+            retError.put("message", "Channel URL is not set");
+            retError.put("error", "missing_config");
+            callback.callback(retError);
+            return;
+        }
+        JSONObject json;
+        try {
+            json = this.createInfoObject();
+        } catch (JSONException e) {
+            logger.error("Error getChannel JSONException " + e.getMessage());
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
             callback.callback(retError);
@@ -735,16 +1105,16 @@ public class CapacitorUpdater {
 
         Request request = new Request.Builder()
             .url(channelUrl)
-            .delete(RequestBody.create(json.toString(), MediaType.get("application/json")))
+            .put(RequestBody.create(json.toString(), MediaType.get("application/json")))
             .build();
 
-        client
+        DownloadService.sharedClient
             .newCall(request)
             .enqueue(
                 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);
@@ -753,8 +1123,30 @@ public class CapacitorUpdater {
                     @Override
                     public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
                         try (ResponseBody responseBody = response.body()) {
+                            // Check for 429 rate limit
+                            if (checkAndHandleRateLimitResponse(response)) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", "Rate limit exceeded");
+                                retError.put("error", "rate_limit_exceeded");
+                                callback.callback(retError);
+                                return;
+                            }
+
+                            if (response.code() == 400) {
+                                assert responseBody != null;
+                                String data = responseBody.string();
+                                if (data.contains("channel_not_found") && !defaultChannel.isEmpty()) {
+                                    Map<String, Object> ret = new HashMap<>();
+                                    ret.put("channel", defaultChannel);
+                                    ret.put("status", "default");
+                                    logger.info("Channel get to \"" + ret);
+                                    callback.callback(ret);
+                                    return;
+                                }
+                            }
+
                             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);
@@ -764,7 +1156,21 @@ public class CapacitorUpdater {
                             assert responseBody != null;
                             String responseData = responseBody.string();
                             JSONObject jsonResponse = new JSONObject(responseData);
-                            JSObject ret = new JSObject();
+
+                            // Check for server-side errors first
+                            if (jsonResponse.has("error")) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("error", jsonResponse.getString("error"));
+                                if (jsonResponse.has("message")) {
+                                    retError.put("message", jsonResponse.getString("message"));
+                                } else {
+                                    retError.put("message", "server did not provide a message");
+                                }
+                                callback.callback(retError);
+                                return;
+                            }
+
+                            Map<String, Object> ret = new HashMap<>();
 
                             Iterator<String> keys = jsonResponse.keys();
                             while (keys.hasNext()) {
@@ -773,10 +1179,10 @@ public class CapacitorUpdater {
                                     ret.put(key, jsonResponse.get(key));
                                 }
                             }
-                            Log.i(TAG, "Channel unset");
+                            logger.info("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);
@@ -786,66 +1192,63 @@ public class CapacitorUpdater {
             );
     }
 
-    public void setChannel(final String channel, final Callback callback) {
-        String channelUrl = this.channelUrl;
-        if (channelUrl == null || channelUrl.isEmpty()) {
-            Log.e(TAG, "Channel URL is not set");
-            final JSObject retError = new JSObject();
-            retError.put("message", "channelUrl missing");
-            retError.put("error", "missing_config");
+    public void listChannels(final Callback callback) {
+        // Check if rate limit was exceeded
+        if (rateLimitExceeded) {
+            logger.debug("Skipping listChannels due to rate limit (429). Requests will resume after app restart.");
+            final Map<String, Object> retError = new HashMap<>();
+            retError.put("message", "Rate limit exceeded");
+            retError.put("error", "rate_limit_exceeded");
             callback.callback(retError);
             return;
         }
-        JSONObject json;
-        try {
-            json = this.createInfoObject();
-            json.put("channel", channel);
-        } catch (JSONException e) {
-            Log.e(TAG, "Error setChannel JSONException", e);
-            final JSObject retError = new JSObject();
-            retError.put("message", "Cannot get info: " + e);
-            retError.put("error", "json_error");
-            callback.callback(retError);
-            return;
-        }
-
-        makeJsonRequest(channelUrl, json, callback);
-    }
 
-    public void getChannel(final Callback callback) {
         String channelUrl = this.channelUrl;
         if (channelUrl == null || channelUrl.isEmpty()) {
-            Log.e(TAG, "Channel URL is not set");
-            final JSObject retError = new JSObject();
+            logger.error("Channel URL is not set");
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Channel URL is not set");
             retError.put("error", "missing_config");
             callback.callback(retError);
             return;
         }
+
         JSONObject json;
         try {
             json = this.createInfoObject();
         } catch (JSONException e) {
-            Log.e(TAG, "Error getChannel JSONException", e);
-            final JSObject retError = new JSObject();
+            logger.error("Error creating info object: " + e.getMessage());
+            final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
             callback.callback(retError);
             return;
         }
 
-        Request request = new Request.Builder()
-            .url(channelUrl)
-            .put(RequestBody.create(json.toString(), MediaType.get("application/json")))
-            .build();
+        // Build URL with query parameters from JSON
+        HttpUrl.Builder urlBuilder = HttpUrl.parse(channelUrl).newBuilder();
+        try {
+            Iterator<String> keys = json.keys();
+            while (keys.hasNext()) {
+                String key = keys.next();
+                Object value = json.get(key);
+                if (value != null) {
+                    urlBuilder.addQueryParameter(key, value.toString());
+                }
+            }
+        } catch (JSONException e) {
+            logger.error("Error adding query parameters: " + e.getMessage());
+        }
+
+        Request request = new Request.Builder().url(urlBuilder.build()).get().build();
 
-        client
+        DownloadService.sharedClient
             .newCall(request)
             .enqueue(
                 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);
@@ -854,21 +1257,17 @@ public class CapacitorUpdater {
                     @Override
                     public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
                         try (ResponseBody responseBody = response.body()) {
-                            if (response.code() == 400) {
-                                assert responseBody != null;
-                                String data = responseBody.string();
-                                if (data.contains("channel_not_found") && !defaultChannel.isEmpty()) {
-                                    JSObject ret = new JSObject();
-                                    ret.put("channel", defaultChannel);
-                                    ret.put("status", "default");
-                                    Log.i(TAG, "Channel get to \"" + ret);
-                                    callback.callback(ret);
-                                    return;
-                                }
+                            // Check for 429 rate limit
+                            if (checkAndHandleRateLimitResponse(response)) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", "Rate limit exceeded");
+                                retError.put("error", "rate_limit_exceeded");
+                                callback.callback(retError);
+                                return;
                             }
 
                             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);
@@ -876,24 +1275,57 @@ public class CapacitorUpdater {
                             }
 
                             assert responseBody != null;
-                            String responseData = responseBody.string();
-                            JSONObject jsonResponse = new JSONObject(responseData);
-                            JSObject ret = new JSObject();
+                            String data = responseBody.string();
+
+                            try {
+                                Map<String, Object> ret = new HashMap<>();
+
+                                try {
+                                    // Try to parse as direct array first
+                                    JSONArray channelsJson = new JSONArray(data);
+                                    List<Map<String, Object>> channelsList = new ArrayList<>();
+
+                                    for (int i = 0; i < channelsJson.length(); i++) {
+                                        JSONObject channelJson = channelsJson.getJSONObject(i);
+                                        Map<String, Object> channel = new HashMap<>();
+                                        channel.put("id", channelJson.optString("id", ""));
+                                        channel.put("name", channelJson.optString("name", ""));
+                                        channel.put("public", channelJson.optBoolean("public", false));
+                                        channel.put("allow_self_set", channelJson.optBoolean("allow_self_set", false));
+                                        channelsList.add(channel);
+                                    }
 
-                            Iterator<String> keys = jsonResponse.keys();
-                            while (keys.hasNext()) {
-                                String key = keys.next();
-                                if (jsonResponse.has(key)) {
-                                    ret.put(key, jsonResponse.get(key));
+                                    // Wrap in channels object for JS API
+                                    ret.put("channels", channelsList);
+
+                                    logger.info("Channels listed successfully");
+                                    callback.callback(ret);
+                                } catch (JSONException arrayException) {
+                                    // If not an array, try to parse as error object
+                                    try {
+                                        JSONObject json = new JSONObject(data);
+                                        if (json.has("error")) {
+                                            Map<String, Object> retError = new HashMap<>();
+                                            retError.put("error", json.getString("error"));
+                                            if (json.has("message")) {
+                                                retError.put("message", json.getString("message"));
+                                            } else {
+                                                retError.put("message", "server did not provide a message");
+                                            }
+                                            callback.callback(retError);
+                                            return;
+                                        }
+                                    } catch (JSONException objException) {
+                                        // If neither array nor object, throw parse error
+                                        throw arrayException;
+                                    }
                                 }
+                            } catch (JSONException e) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", "JSON parse error: " + e.getMessage());
+                                retError.put("error", "parse_error");
+                                callback.callback(retError);
                             }
-                            Log.i(TAG, "Channel get to \"" + ret);
-                            callback.callback(ret);
-                        } catch (JSONException e) {
-                            JSObject retError = new JSObject();
-                            retError.put("message", "JSON parse error: " + e.getMessage());
-                            retError.put("error", "parse_error");
-                            callback.callback(retError);
                         }
                     }
                 }
@@ -909,6 +1341,12 @@ public class CapacitorUpdater {
     }
 
     public void sendStats(final String action, final String versionName, final String oldVersionName) {
+        // Check if rate limit was exceeded
+        if (rateLimitExceeded) {
+            logger.debug("Skipping sendStats due to rate limit (429). Stats will resume after app restart.");
+            return;
+        }
+
         String statsUrl = this.statsUrl;
         if (statsUrl == null || statsUrl.isEmpty()) {
             return;
@@ -920,7 +1358,7 @@ public class CapacitorUpdater {
             json.put("old_version_name", oldVersionName);
             json.put("action", action);
         } catch (JSONException e) {
-            Log.e(TAG, "Error sendStats JSONException", e);
+            logger.error("Error sendStats JSONException " + e.getMessage());
             return;
         }
 
@@ -929,21 +1367,28 @@ public class CapacitorUpdater {
             .post(RequestBody.create(json.toString(), MediaType.get("application/json")))
             .build();
 
-        client
+        DownloadService.sharedClient
             .newCall(request)
             .enqueue(
                 new okhttp3.Callback() {
                     @Override
                     public void onFailure(@NonNull Call call, @NonNull IOException e) {
-                        Log.e(TAG, "Failed to send stats: " + e.getMessage());
+                        logger.error("Failed to send stats: " + e.getMessage());
                     }
 
                     @Override
                     public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
-                        if (response.isSuccessful()) {
-                            Log.i(TAG, "Stats send for \"" + action + "\", version " + versionName);
-                        } else {
-                            Log.e(TAG, "Error sending stats: " + response.code());
+                        try (ResponseBody responseBody = response.body()) {
+                            // Check for 429 rate limit
+                            if (checkAndHandleRateLimitResponse(response)) {
+                                return;
+                            }
+
+                            if (response.isSuccessful()) {
+                                logger.info("Stats send for \"" + action + "\", version " + versionName);
+                            } else {
+                                logger.error("Error sending stats: " + response.code());
+                            }
                         }
                     }
                 }
@@ -963,13 +1408,26 @@ public class CapacitorUpdater {
         } else {
             try {
                 String stored = this.prefs.getString(trueId + INFO_SUFFIX, "");
-                result = BundleInfo.fromJSON(stored);
+                if (stored.isEmpty()) {
+                    result = new BundleInfo(trueId, null, BundleStatus.PENDING, "", "");
+                } else {
+                    result = BundleInfo.fromJSON(stored);
+                }
             } catch (JSONException e) {
-                Log.e(TAG, "Failed to parse info for bundle [" + trueId + "] ", e);
-                result = new BundleInfo(trueId, null, BundleStatus.PENDING, "", "");
+                logger.error(
+                    "Failed to parse info for bundle [" +
+                        trueId +
+                        "] stored value: '" +
+                        this.prefs.getString(trueId + INFO_SUFFIX, "") +
+                        "' error: " +
+                        e.getMessage()
+                );
+                // Clear corrupted data
+                this.editor.remove(trueId + INFO_SUFFIX);
+                this.editor.commit();
+                result = new BundleInfo(trueId, null, BundleStatus.ERROR, "", "");
             }
         }
-        // Log.d(TAG, "Returning info [" + trueId + "] " + result);
         return result;
     }
 
@@ -989,17 +1447,18 @@ public class CapacitorUpdater {
 
     public void saveBundleInfo(final String id, final BundleInfo info) {
         if (id == null || (info != null && (info.isBuiltin() || info.isUnknown()))) {
-            Log.d(TAG, "Not saving info for bundle: [" + id + "] " + info);
+            logger.debug("Not saving info for bundle: [" + id + "] " + info);
             return;
         }
 
         if (info == null) {
-            Log.d(TAG, "Removing info for bundle [" + id + "]");
+            logger.debug("Removing info for bundle [" + id + "]");
             this.editor.remove(id + INFO_SUFFIX);
         } else {
             final BundleInfo update = info.setId(id);
-            Log.d(TAG, "Storing info for bundle [" + id + "] " + update.toString());
-            this.editor.putString(id + INFO_SUFFIX, update.toString());
+            String jsonString = update.toString();
+            logger.debug("Storing info for bundle [" + id + "] " + update.getClass().getName() + " -> " + jsonString);
+            this.editor.putString(id + INFO_SUFFIX, jsonString);
         }
         this.editor.commit();
     }
@@ -1007,7 +1466,7 @@ public class CapacitorUpdater {
     private void setBundleStatus(final String id, final BundleStatus status) {
         if (id != null && status != null) {
             BundleInfo info = this.getBundleInfo(id);
-            Log.d(TAG, "Setting status for bundle [" + id + "] to " + status);
+            logger.debug("Setting status for bundle [" + id + "] to " + status);
             this.saveBundleInfo(id, info.setStatus(status));
         }
     }
@@ -1026,7 +1485,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";
         }