@capgo/capacitor-updater 7.2.20 → 7.3.3

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

@@ -10,7 +10,6 @@ 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;
@@ -40,7 +39,9 @@ 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();
@@ -75,6 +76,10 @@ public class CapacitorUpdater {
     public String deviceID = "";
     public int timeout = 20000;
 
+    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"));
@@ -143,7 +148,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());
@@ -208,7 +213,7 @@ 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;
         }
 
@@ -236,7 +241,7 @@ public class CapacitorUpdater {
 
                             boolean success = finishDownload(id, dest, version, sessionKey, checksum, true, isManifest);
                             if (!success) {
-                                Log.e(TAG, "Finish download failed: " + version);
+                                logger.error("Finish download failed: " + version);
                                 saveBundleInfo(
                                     id,
                                     new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "")
@@ -251,7 +256,7 @@ public class CapacitorUpdater {
                         case FAILED:
                             Data failedData = workInfo.getOutputData();
                             String error = failedData.getString(DownloadService.ERROR);
-                            Log.e(TAG, "Download failed: " + error + " " + workInfo.getState());
+                            logger.error("Download failed: " + error + " " + workInfo.getState());
                             String failedVersion = failedData.getString(DownloadService.VERSION);
                             saveBundleInfo(
                                 id,
@@ -281,7 +286,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);
@@ -326,7 +331,7 @@ public class CapacitorUpdater {
 
                 // If public key is present but no checksum provided, refuse installation
                 if (!this.publicKey.isEmpty() && checksumDecrypted.isEmpty()) {
-                    Log.e(CapacitorUpdater.TAG, "Public key present but no checksum provided");
+                    logger.error("Public key present but no checksum provided");
                     this.sendStats("checksum_required");
                     throw new IOException("Checksum required when public key is present: " + id);
                 }
@@ -339,7 +344,7 @@ public class CapacitorUpdater {
                     checksum = CryptoCipherV2.calcChecksum(downloaded);
                 }
                 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);
                 }
@@ -348,14 +353,14 @@ public class CapacitorUpdater {
         } catch (Exception e) {
             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 Map<String, Object> ret = new HashMap<>();
-            ret.put("version", CapacitorUpdater.this.getCurrentBundle().getVersionName());
+            ret.put("version", CapgoUpdater.this.getCurrentBundle().getVersionName());
 
-            CapacitorUpdater.this.notifyListeners("downloadFailed", ret);
-            CapacitorUpdater.this.sendStats("download_fail");
+            CapgoUpdater.this.notifyListeners("downloadFailed", ret);
+            CapgoUpdater.this.sendStats("download_fail");
             return false;
         }
 
@@ -378,10 +383,10 @@ public class CapacitorUpdater {
 
             final Map<String, Object> ret = new HashMap<>();
             ret.put("bundle", next.toJSONMap());
-            CapacitorUpdater.this.notifyListeners("updateAvailable", ret);
+            CapgoUpdater.this.notifyListeners("updateAvailable", ret);
             if (setNext) {
                 if (this.directUpdate) {
-                    CapacitorUpdater.this.directUpdateFinish(next);
+                    CapgoUpdater.this.directUpdateFinish(next);
                     this.directUpdate = false;
                 } else {
                     this.setNextBundle(next.getId());
@@ -390,9 +395,9 @@ public class CapacitorUpdater {
         } catch (IOException e) {
             e.printStackTrace();
             final Map<String, Object> ret = new HashMap<>();
-            ret.put("version", CapacitorUpdater.this.getCurrentBundle().getVersionName());
-            CapacitorUpdater.this.notifyListeners("downloadFailed", ret);
-            CapacitorUpdater.this.sendStats("download_fail");
+            ret.put("version", CapgoUpdater.this.getCurrentBundle().getVersionName());
+            CapgoUpdater.this.notifyListeners("downloadFailed", ret);
+            CapgoUpdater.this.sendStats("download_fail");
             return false;
         }
         return true;
@@ -414,7 +419,7 @@ public class CapacitorUpdater {
 
     private void setCurrentBundle(final File bundle) {
         this.editor.putString(this.CAP_SERVER_PATH, bundle.getPath());
-        Log.i(TAG, "Current bundle set to: " + bundle);
+        logger.info("Current bundle set to: " + bundle);
         this.editor.commit();
     }
 
@@ -427,10 +432,18 @@ public class CapacitorUpdater {
     ) {
         final String id = this.randomString();
 
-        // Check if version is already downloading
+        // Check if version is already downloading, but allow retry if previous download failed
         if (this.activity != null && DownloadWorkerManager.isVersionDownloading(version)) {
-            Log.i(TAG, "Version already downloading: " + version);
-            return;
+            // 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()), ""));
@@ -441,6 +454,13 @@ 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()), ""));
         this.notifyDownload(id, 0);
@@ -474,7 +494,7 @@ public class CapacitorUpdater {
             }
             return getBundleInfo(id);
         } catch (Exception e) {
-            Log.e(TAG, "Error waiting for download", e);
+            logger.error("Error waiting for download " + e.getMessage());
             saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), ""));
             throw new IOException("Error waiting for download: " + e.getMessage());
         }
@@ -484,14 +504,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 {
@@ -510,12 +530,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
@@ -532,7 +552,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);
@@ -546,7 +566,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;
         }
     }
@@ -572,7 +592,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);
@@ -588,7 +608,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();
         }
     }
@@ -600,12 +620,12 @@ 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());
+        logger.debug("Fallback bundle is: " + fallback);
+        logger.info("Version successfully loaded: " + bundle.getVersionName());
         if (autoDeletePrevious && !fallback.isBuiltin()) {
             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());
             }
         }
         this.setFallbackBundle(bundle);
@@ -616,7 +636,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);
@@ -712,7 +732,7 @@ public class CapacitorUpdater {
                 json.put("defaultChannel", channel);
             }
         } catch (JSONException e) {
-            Log.e(TAG, "Error getLatest JSONException", e);
+            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");
@@ -720,7 +740,7 @@ public class CapacitorUpdater {
             return;
         }
 
-        Log.i(CapacitorUpdater.TAG, "Auto-update parameters: " + json);
+        logger.info("Auto-update parameters: " + json);
 
         makeJsonRequest(updateUrl, json, callback);
     }
@@ -728,7 +748,7 @@ public class CapacitorUpdater {
     public void unsetChannel(final Callback callback) {
         String channelUrl = this.channelUrl;
         if (channelUrl == null || channelUrl.isEmpty()) {
-            Log.e(TAG, "Channel URL is not set");
+            logger.error("Channel URL is not set");
             final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "channelUrl missing");
             retError.put("error", "missing_config");
@@ -739,7 +759,7 @@ public class CapacitorUpdater {
         try {
             json = this.createInfoObject();
         } catch (JSONException e) {
-            Log.e(TAG, "Error unsetChannel JSONException", e);
+            logger.error("Error unsetChannel JSONException " + e.getMessage());
             final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
@@ -787,7 +807,7 @@ public class CapacitorUpdater {
                                     ret.put(key, jsonResponse.get(key));
                                 }
                             }
-                            Log.i(TAG, "Channel unset");
+                            logger.info("Channel unset");
                             callback.callback(ret);
                         } catch (JSONException e) {
                             Map<String, Object> retError = new HashMap<>();
@@ -803,7 +823,7 @@ 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");
+            logger.error("Channel URL is not set");
             final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "channelUrl missing");
             retError.put("error", "missing_config");
@@ -815,7 +835,7 @@ public class CapacitorUpdater {
             json = this.createInfoObject();
             json.put("channel", channel);
         } catch (JSONException e) {
-            Log.e(TAG, "Error setChannel JSONException", e);
+            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");
@@ -829,7 +849,7 @@ public class CapacitorUpdater {
     public void getChannel(final Callback callback) {
         String channelUrl = this.channelUrl;
         if (channelUrl == null || channelUrl.isEmpty()) {
-            Log.e(TAG, "Channel URL is not set");
+            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");
@@ -840,7 +860,7 @@ public class CapacitorUpdater {
         try {
             json = this.createInfoObject();
         } catch (JSONException e) {
-            Log.e(TAG, "Error getChannel 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");
@@ -875,7 +895,7 @@ public class CapacitorUpdater {
                                     Map<String, Object> ret = new HashMap<>();
                                     ret.put("channel", defaultChannel);
                                     ret.put("status", "default");
-                                    Log.i(TAG, "Channel get to \"" + ret);
+                                    logger.info("Channel get to \"" + ret);
                                     callback.callback(ret);
                                     return;
                                 }
@@ -901,7 +921,7 @@ public class CapacitorUpdater {
                                     ret.put(key, jsonResponse.get(key));
                                 }
                             }
-                            Log.i(TAG, "Channel get to \"" + ret);
+                            logger.info("Channel get to \"" + ret);
                             callback.callback(ret);
                         } catch (JSONException e) {
                             Map<String, Object> retError = new HashMap<>();
@@ -934,7 +954,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;
         }
 
@@ -949,15 +969,15 @@ public class CapacitorUpdater {
                 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);
+                            logger.info("Stats send for \"" + action + "\", version " + versionName);
                         } else {
-                            Log.e(TAG, "Error sending stats: " + response.code());
+                            logger.error("Error sending stats: " + response.code());
                         }
                     }
                 }
@@ -977,13 +997,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;
     }
 
@@ -1003,17 +1036,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();
     }
@@ -1021,7 +1055,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));
         }
     }

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

@@ -12,7 +12,6 @@ package ee.forgr.capacitor_updater;
  * references: http://stackoverflow.com/questions/12471999/rsa-encryption-decryption-in-android
  */
 import android.util.Base64;
-import android.util.Log;
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.File;
@@ -38,6 +37,12 @@ import javax.crypto.spec.SecretKeySpec;
 
 public class CryptoCipherV2 {
 
+    private static Logger logger;
+
+    public static void setLogger(Logger loggerInstance) {
+        logger = loggerInstance;
+    }
+
     public static byte[] decryptRSA(byte[] source, PublicKey publicKey)
         throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
         Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
@@ -135,11 +140,11 @@ public class CryptoCipherV2 {
 
     public static void decryptFile(final File file, final String publicKey, final String ivSessionKey) throws IOException {
         if (publicKey.isEmpty() || ivSessionKey == null || ivSessionKey.isEmpty() || ivSessionKey.split(":").length != 2) {
-            Log.i(CapacitorUpdater.TAG, "Encryption not set, no public key or seesion, ignored");
+            logger.info("Encryption not set, no public key or seesion, ignored");
             return;
         }
         if (!publicKey.startsWith("-----BEGIN RSA PUBLIC KEY-----")) {
-            Log.e(CapacitorUpdater.TAG, "The public key is not a valid RSA Public key");
+            logger.error("The public key is not a valid RSA Public key");
             return;
         }
 
@@ -168,7 +173,7 @@ public class CryptoCipherV2 {
                 }
             }
         } catch (GeneralSecurityException e) {
-            Log.i(CapacitorUpdater.TAG, "decryptFile fail");
+            logger.info("decryptFile fail");
             e.printStackTrace();
             throw new IOException("GeneralSecurityException");
         }
@@ -176,7 +181,7 @@ public class CryptoCipherV2 {
 
     public static String decryptChecksum(String checksum, String publicKey) throws IOException {
         if (publicKey.isEmpty()) {
-            Log.e(CapacitorUpdater.TAG, "No encryption set (public key) ignored");
+            logger.error("No encryption set (public key) ignored");
             return checksum;
         }
         try {
@@ -187,7 +192,7 @@ public class CryptoCipherV2 {
             String result = Base64.encodeToString(decryptedChecksum, Base64.DEFAULT);
             return result.replaceAll("\\s", ""); // Remove all whitespace, including newlines
         } catch (GeneralSecurityException e) {
-            Log.e(CapacitorUpdater.TAG, "decryptChecksum fail: " + e.getMessage());
+            logger.error("decryptChecksum fail: " + e.getMessage());
             throw new IOException("Decryption failed: " + e.getMessage());
         }
     }
@@ -198,7 +203,7 @@ public class CryptoCipherV2 {
         try {
             digest = MessageDigest.getInstance("SHA-256");
         } catch (java.security.NoSuchAlgorithmException e) {
-            System.err.println(CapacitorUpdater.TAG + " SHA-256 algorithm not available");
+            logger.error("SHA-256 algorithm not available");
             return "";
         }
 
@@ -217,7 +222,7 @@ public class CryptoCipherV2 {
             }
             return hexString.toString();
         } catch (IOException e) {
-            System.err.println(CapacitorUpdater.TAG + " Cannot calc checksum v2: " + file.getPath() + " " + e.getMessage());
+            logger.error("Cannot calc checksum v2: " + file.getPath() + " " + e.getMessage());
             return "";
         }
     }