@capgo/capacitor-updater 7.2.21 → 7.4.0

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

@@ -1,7 +1,6 @@
 package ee.forgr.capacitor_updater;
 
 import android.content.SharedPreferences;
-import android.util.Log;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import io.github.g00fy2.versioncompare.Version;
@@ -12,6 +11,8 @@ import java.util.Date;
 
 public class DelayUpdateUtils {
 
+    private final Logger logger;
+
     public static final String DELAY_CONDITION_PREFERENCES = "DELAY_CONDITION_PREFERENCES_CAPGO";
     public static final String BACKGROUND_TIMESTAMP_KEY = "BACKGROUND_TIMESTAMP_KEY_CAPGO";
 
@@ -20,11 +21,18 @@ public class DelayUpdateUtils {
     private final Version currentVersionNative;
     private final Runnable installNext;
 
-    public DelayUpdateUtils(SharedPreferences prefs, SharedPreferences.Editor editor, Version currentVersionNative, Runnable installNext) {
+    public DelayUpdateUtils(
+        SharedPreferences prefs,
+        SharedPreferences.Editor editor,
+        Version currentVersionNative,
+        Runnable installNext,
+        Logger logger
+    ) {
         this.prefs = prefs;
         this.editor = editor;
         this.currentVersionNative = currentVersionNative;
         this.installNext = installNext;
+        this.logger = logger;
     }
 
     public enum CancelDelaySource {
@@ -54,8 +62,7 @@ public class DelayUpdateUtils {
                         try {
                             longValue = Long.parseLong(value);
                         } catch (NumberFormatException e) {
-                            Log.e(
-                                CapgoUpdater.TAG,
+                            logger.error(
                                 "Background condition (value: " +
                                 value +
                                 ") had an invalid value at index " +
@@ -65,8 +72,7 @@ public class DelayUpdateUtils {
                         }
 
                         if (delta > longValue) {
-                            Log.i(
-                                CapgoUpdater.TAG,
+                            logger.info(
                                 "Background condition (value: " +
                                 value +
                                 ") deleted at index " +
@@ -79,8 +85,7 @@ public class DelayUpdateUtils {
                         }
                     } else {
                         delayConditionListToKeep.add(condition);
-                        Log.i(
-                            CapgoUpdater.TAG,
+                        logger.info(
                             "Background delay (value: " +
                             value +
                             ") condition kept at index " +
@@ -96,8 +101,7 @@ public class DelayUpdateUtils {
                         this.installNext.run();
                     } else {
                         delayConditionListToKeep.add(condition);
-                        Log.i(
-                            CapgoUpdater.TAG,
+                        logger.info(
                             "Kill delay (value: " + value + ") condition kept at index " + index + " (source: " + source.toString() + ")"
                         );
                     }
@@ -109,23 +113,23 @@ public class DelayUpdateUtils {
                             Date date = sdf.parse(value);
                             assert date != null;
                             if (new Date().compareTo(date) > 0) {
-                                Log.i(
-                                    CapgoUpdater.TAG,
-                                    "Date delay (value: " + value + ") condition removed due to expired date at index " + index
-                                );
+                                logger.info("Date delay (value: " + value + ") condition removed due to expired date at index " + index);
                             } else {
                                 delayConditionListToKeep.add(condition);
-                                Log.i(CapgoUpdater.TAG, "Date delay (value: " + value + ") condition kept at index " + index);
+                                logger.info("Date delay (value: " + value + ") condition kept at index " + index);
                             }
                         } catch (final Exception e) {
-                            Log.e(
-                                CapgoUpdater.TAG,
-                                "Date delay (value: " + value + ") condition removed due to parsing issue at index " + index,
-                                e
+                            logger.error(
+                                "Date delay (value: " +
+                                value +
+                                ") condition removed due to parsing issue at index " +
+                                index +
+                                " " +
+                                e.getMessage()
                             );
                         }
                     } else {
-                        Log.d(CapgoUpdater.TAG, "Date delay (value: " + value + ") condition removed due to empty value at index " + index);
+                        logger.debug("Date delay (value: " + value + ") condition removed due to empty value at index " + index);
                     }
                     break;
                 case DelayUntilNext.nativeVersion:
@@ -133,26 +137,25 @@ public class DelayUpdateUtils {
                         try {
                             final Version versionLimit = new Version(value);
                             if (this.currentVersionNative.isAtLeast(versionLimit)) {
-                                Log.i(
-                                    CapgoUpdater.TAG,
+                                logger.info(
                                     "Native version delay (value: " + value + ") condition removed due to above limit at index " + index
                                 );
                             } else {
                                 delayConditionListToKeep.add(condition);
-                                Log.i(CapgoUpdater.TAG, "Native version delay (value: " + value + ") condition kept at index " + index);
+                                logger.info("Native version delay (value: " + value + ") condition kept at index " + index);
                             }
                         } catch (final Exception e) {
-                            Log.e(
-                                CapgoUpdater.TAG,
-                                "Native version delay (value: " + value + ") condition removed due to parsing issue at index " + index,
-                                e
+                            logger.error(
+                                "Native version delay (value: " +
+                                value +
+                                ") condition removed due to parsing issue at index " +
+                                index +
+                                " " +
+                                e.getMessage()
                             );
                         }
                     } else {
-                        Log.d(
-                            CapgoUpdater.TAG,
-                            "Native version delay (value: " + value + ") condition removed due to empty value at index " + index
-                        );
+                        logger.debug("Native version delay (value: " + value + ") condition removed due to empty value at index " + index);
                     }
                     break;
             }
@@ -168,10 +171,10 @@ public class DelayUpdateUtils {
         try {
             this.editor.putString(DELAY_CONDITION_PREFERENCES, delayConditions);
             this.editor.commit();
-            Log.i(CapgoUpdater.TAG, "Delay update saved");
+            logger.info("Delay update saved");
             return true;
         } catch (final Exception e) {
-            Log.e(CapgoUpdater.TAG, "Failed to delay update, [Error calling '_setMultiDelay()']", e);
+            logger.error("Failed to delay update, [Error calling '_setMultiDelay()'] " + e.getMessage());
             return false;
         }
     }
@@ -180,9 +183,9 @@ public class DelayUpdateUtils {
         try {
             this.editor.putLong(BACKGROUND_TIMESTAMP_KEY, backgroundTimestamp);
             this.editor.commit();
-            Log.i(CapgoUpdater.TAG, "Delay update saved");
+            logger.info("Delay update saved");
         } catch (final Exception e) {
-            Log.e(CapgoUpdater.TAG, "Failed to delay update, [Error calling '_setBackgroundTimestamp()']", e);
+            logger.error("Failed to delay update, [Error calling '_setBackgroundTimestamp()'] " + e.getMessage());
         }
     }
 
@@ -190,9 +193,9 @@ public class DelayUpdateUtils {
         try {
             this.editor.remove(BACKGROUND_TIMESTAMP_KEY);
             this.editor.commit();
-            Log.i(CapgoUpdater.TAG, "Delay update saved");
+            logger.info("Delay update saved");
         } catch (final Exception e) {
-            Log.e(CapgoUpdater.TAG, "Failed to delay update, [Error calling '_unsetBackgroundTimestamp()']", e);
+            logger.error("Failed to delay update, [Error calling '_unsetBackgroundTimestamp()'] " + e.getMessage());
         }
     }
 
@@ -200,7 +203,7 @@ public class DelayUpdateUtils {
         try {
             return this.prefs.getLong(BACKGROUND_TIMESTAMP_KEY, 0);
         } catch (final Exception e) {
-            Log.e(CapgoUpdater.TAG, "Failed to delay update, [Error calling '_getBackgroundTimestamp()']", e);
+            logger.error("Failed to delay update, [Error calling '_getBackgroundTimestamp()'] " + e.getMessage());
             return 0;
         }
     }
@@ -209,10 +212,10 @@ public class DelayUpdateUtils {
         try {
             this.editor.remove(DELAY_CONDITION_PREFERENCES);
             this.editor.commit();
-            Log.i(CapgoUpdater.TAG, "All delays canceled from " + source);
+            logger.info("All delays canceled from " + source);
             return true;
         } catch (final Exception e) {
-            Log.e(CapgoUpdater.TAG, "Failed to cancel update delay", e);
+            logger.error("Failed to cancel update delay " + e.getMessage());
             return false;
         }
     }

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

@@ -6,7 +6,6 @@
 package ee.forgr.capacitor_updater;
 
 import android.content.Context;
-import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.work.Data;
 import androidx.work.Worker;
@@ -39,7 +38,12 @@ import org.json.JSONObject;
 
 public class DownloadService extends Worker {
 
-    public static final String TAG = "Capacitor-updater";
+    private static Logger logger;
+
+    public static void setLogger(Logger loggerInstance) {
+        logger = loggerInstance;
+    }
+
     public static final String URL = "URL";
     public static final String ID = "id";
     public static final String PERCENT = "percent";
@@ -94,7 +98,7 @@ public class DownloadService extends Worker {
             String publicKey = getInputData().getString(PUBLIC_KEY);
             boolean isManifest = getInputData().getBoolean(IS_MANIFEST, false);
 
-            Log.d(TAG, "doWork isManifest: " + isManifest);
+            logger.debug("doWork isManifest: " + isManifest);
 
             if (isManifest) {
                 JSONArray manifest = DataManager.getInstance().getAndClearManifest();
@@ -102,7 +106,7 @@ public class DownloadService extends Worker {
                     handleManifestDownload(id, documentsDir, dest, version, sessionKey, publicKey, manifest.toString());
                     return createSuccessResult(dest, version, sessionKey, checksum, true);
                 } else {
-                    Log.e(TAG, "Manifest is null");
+                    logger.error("Manifest is null");
                     return createFailureResult("Manifest is null");
                 }
             } else {
@@ -134,7 +138,7 @@ public class DownloadService extends Worker {
         String manifestString
     ) {
         try {
-            Log.d(TAG, "handleManifestDownload");
+            logger.debug("handleManifestDownload");
             JSONArray manifest = new JSONArray(manifestString);
             File destFolder = new File(documentsDir, dest);
             File cacheFolder = new File(getApplicationContext().getCacheDir(), "capgo_downloads");
@@ -167,7 +171,7 @@ public class DownloadService extends Worker {
                     try {
                         fileHash = CryptoCipherV2.decryptChecksum(fileHash, publicKey);
                     } catch (Exception e) {
-                        Log.e(TAG, "Error decrypting checksum for " + fileName + "fileHash: " + fileHash);
+                        logger.error("Error decrypting checksum for " + fileName + "fileHash: " + fileHash);
                         hasError.set(true);
                         continue;
                     }
@@ -180,7 +184,7 @@ public class DownloadService extends Worker {
 
                 // Ensure parent directories of the target file exist
                 if (!Objects.requireNonNull(targetFile.getParentFile()).exists() && !targetFile.getParentFile().mkdirs()) {
-                    Log.e(TAG, "Failed to create parent directory for: " + targetFile.getAbsolutePath());
+                    logger.error("Failed to create parent directory for: " + targetFile.getAbsolutePath());
                     hasError.set(true);
                     continue;
                 }
@@ -189,10 +193,10 @@ public class DownloadService extends Worker {
                     try {
                         if (builtinFile.exists() && verifyChecksum(builtinFile, finalFileHash)) {
                             copyFile(builtinFile, targetFile);
-                            Log.d(TAG, "using builtin file " + fileName);
+                            logger.debug("using builtin file " + fileName);
                         } else if (cacheFile.exists() && verifyChecksum(cacheFile, finalFileHash)) {
                             copyFile(cacheFile, targetFile);
-                            Log.d(TAG, "already cached " + fileName);
+                            logger.debug("already cached " + fileName);
                         } else {
                             downloadAndVerify(downloadUrl, targetFile, cacheFile, finalFileHash, sessionKey, publicKey);
                         }
@@ -201,7 +205,7 @@ public class DownloadService extends Worker {
                         int percent = calcTotalPercent(completed, totalFiles);
                         setProgress(percent);
                     } catch (Exception e) {
-                        Log.e(TAG, "Error processing file: " + fileName, e);
+                        logger.error("Error processing file: " + fileName + " " + e.getMessage());
                         hasError.set(true);
                     }
                 });
@@ -213,7 +217,7 @@ public class DownloadService extends Worker {
                 try {
                     future.get();
                 } catch (Exception e) {
-                    Log.e(TAG, "Error waiting for download", e);
+                    logger.error("Error waiting for download " + e.getMessage());
                     hasError.set(true);
                 }
             }
@@ -229,11 +233,11 @@ public class DownloadService extends Worker {
             }
 
             if (hasError.get()) {
-                Log.e(TAG, "One or more files failed to download");
+                logger.error("One or more files failed to download");
                 throw new IOException("One or more files failed to download");
             }
         } catch (Exception e) {
-            Log.e(TAG, "Error in handleManifestDownload", e);
+            logger.error("Error in handleManifestDownload " + e.getMessage());
             throw new RuntimeException(e.getLocalizedMessage());
         }
     }
@@ -347,7 +351,7 @@ public class DownloadService extends Worker {
             infoFile.createNewFile();
             tempFile.createNewFile();
         } catch (IOException e) {
-            Log.e(TAG, "Error in clearDownloadData", e);
+            logger.error("Error in clearDownloadData " + e.getMessage());
             // not a fatal error, so we don't throw an exception
         }
     }
@@ -373,7 +377,7 @@ public class DownloadService extends Worker {
         String sessionKey,
         String publicKey
     ) throws Exception {
-        Log.d(TAG, "downloadAndVerify " + downloadUrl);
+        logger.debug("downloadAndVerify " + downloadUrl);
 
         Request request = new Request.Builder().url(downloadUrl).build();
 
@@ -409,7 +413,7 @@ public class DownloadService extends Worker {
             }
 
             if (!publicKey.isEmpty() && sessionKey != null && !sessionKey.isEmpty()) {
-                Log.d(CapgoUpdater.TAG + " DLSrv", "Decrypting file " + targetFile.getName());
+                logger.debug("Decrypting file " + targetFile.getName());
                 CryptoCipherV2.decryptFile(compressedFile, publicKey, sessionKey);
             }
 
@@ -482,7 +486,7 @@ public class DownloadService extends Worker {
     private byte[] decompressBrotli(byte[] data, String fileName) throws IOException {
         // Validate input
         if (data == null) {
-            Log.e(TAG, "Error: Null data received for " + fileName);
+            logger.error("Error: Null data received for " + fileName);
             throw new IOException("Null data received");
         }
 
@@ -509,7 +513,7 @@ public class DownloadService extends Worker {
                     return Arrays.copyOfRange(data, 3, data.length - 1);
                 }
             } catch (ArrayIndexOutOfBoundsException e) {
-                Log.e(TAG, "Error: Malformed data for " + fileName);
+                logger.error("Error: Malformed data for " + fileName);
                 throw new IOException("Malformed data structure");
             }
         }
@@ -527,13 +531,13 @@ public class DownloadService extends Worker {
             }
             return bos.toByteArray();
         } catch (IOException e) {
-            Log.e(TAG, "Error: Brotli process failed for " + fileName + ". Status: " + e.getMessage());
+            logger.error("Error: Brotli process failed for " + fileName + ". Status: " + e.getMessage());
             // Add hex dump for debugging
             StringBuilder hexDump = new StringBuilder();
             for (int i = 0; i < Math.min(32, data.length); i++) {
                 hexDump.append(String.format("%02x ", data[i]));
             }
-            Log.e(TAG, "Error: Raw data (" + fileName + "): " + hexDump.toString());
+            logger.error("Error: Raw data (" + fileName + "): " + hexDump.toString());
             throw e;
         }
     }

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

@@ -1,7 +1,6 @@
 package ee.forgr.capacitor_updater;
 
 import android.content.Context;
-import android.util.Log;
 import androidx.work.BackoffPolicy;
 import androidx.work.Configuration;
 import androidx.work.Constraints;
@@ -16,7 +15,12 @@ import java.util.concurrent.TimeUnit;
 
 public class DownloadWorkerManager {
 
-    private static final String TAG = "DownloadWorkerManager";
+    private static Logger logger;
+
+    public static void setLogger(Logger loggerInstance) {
+        logger = loggerInstance;
+    }
+
     private static volatile boolean isInitialized = false;
     private static final Set<String> activeVersions = new HashSet<>();
 
@@ -53,7 +57,7 @@ public class DownloadWorkerManager {
 
         // If version is already downloading, don't start another one
         if (isVersionDownloading(version)) {
-            Log.i(TAG, "Version " + version + " is already downloading");
+            logger.info("Version " + version + " is already downloading");
             return;
         }
         activeVersions.add(version);
@@ -74,7 +78,7 @@ public class DownloadWorkerManager {
         // Create network constraints - be more lenient on emulators
         Constraints.Builder constraintsBuilder = new Constraints.Builder();
         if (isEmulator) {
-            Log.i(TAG, "Emulator detected - using lenient network constraints");
+            logger.info("Emulator detected - using lenient network constraints");
             // On emulators, use NOT_REQUIRED to avoid background network issues
             constraintsBuilder.setRequiredNetworkType(NetworkType.NOT_REQUIRED);
         } else {