@capgo/capacitor-updater 6.39.0 → 6.40.2

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

@@ -181,7 +181,8 @@ public class CapgoUpdater {
             ZipEntry entry;
             while ((entry = zis.getNextEntry()) != null) {
                 if (entry.getName().contains("\\")) {
-                    logger.error("unzip: Windows path is not supported, please use unix path as require by zip RFC: " + entry.getName());
+                    logger.error("Unzip failed: Windows path not supported");
+                    logger.debug("Invalid path: " + entry.getName());
                     this.sendStats("windows_path_fail");
                 }
                 final File file = new File(targetDirectory, entry.getName());
@@ -277,7 +278,8 @@ public class CapgoUpdater {
                                 boolean success = finishDownload(id, dest, version, sessionKey, checksum, true, isManifest);
                                 BundleInfo resultBundle;
                                 if (!success) {
-                                    logger.error("Finish download failed: " + version);
+                                    logger.error("Finish download failed");
+                                    logger.debug("Version: " + version);
                                     resultBundle = new BundleInfo(
                                         id,
                                         version,
@@ -309,7 +311,8 @@ public class CapgoUpdater {
                         case FAILED:
                             Data failedData = workInfo.getOutputData();
                             String error = failedData.getString(DownloadService.ERROR);
-                            logger.error("Download failed: " + error + " " + workInfo.getState());
+                            logger.error("Download failed");
+                            logger.debug("Error: " + error + ", State: " + workInfo.getState());
                             String failedVersion = failedData.getString(DownloadService.VERSION);
 
                             io.execute(() -> {
@@ -428,7 +431,8 @@ public class CapgoUpdater {
                 CryptoCipher.logChecksumInfo("Calculated checksum", checksum);
                 CryptoCipher.logChecksumInfo("Expected checksum", checksumDecrypted);
                 if ((!checksumDecrypted.isEmpty() || !this.publicKey.isEmpty()) && !checksumDecrypted.equals(checksum)) {
-                    logger.error("Error checksum '" + checksumDecrypted + "' '" + checksum + "' '");
+                    logger.error("Checksum mismatch");
+                    logger.debug("Expected: " + checksumDecrypted + ", Got: " + checksum);
                     this.sendStats("checksum_fail");
                     throw new IOException("Checksum failed: " + id);
                 }
@@ -440,7 +444,8 @@ public class CapgoUpdater {
             }
             final Boolean res = this.delete(id);
             if (!res) {
-                logger.info("Double error, cannot cleanup: " + version);
+                logger.info("Failed to cleanup after error");
+                logger.debug("Version: " + version);
             }
 
             final Map<String, Object> ret = new HashMap<>();
@@ -541,7 +546,8 @@ public class CapgoUpdater {
             this.deleteDirectory(cacheFolder, threadToCheck);
             logger.info("Cleaned up delta cache folder");
         } catch (IOException e) {
-            logger.error("Failed to cleanup delta cache: " + e.getMessage());
+            logger.error("Failed to cleanup delta cache");
+            logger.debug("Error: " + e.getMessage());
         }
     }
 
@@ -582,9 +588,11 @@ public class CapgoUpdater {
                 try {
                     this.deleteDirectory(entry, threadToCheck);
                     this.removeBundleInfo(id);
-                    logger.info("Deleted orphan bundle directory: " + id);
+                    logger.info("Deleted orphan bundle directory");
+                    logger.debug("Bundle ID: " + id);
                 } catch (IOException e) {
-                    logger.error("Failed to delete orphan bundle directory: " + id + " " + e.getMessage());
+                    logger.error("Failed to delete orphan bundle directory");
+                    logger.debug("Bundle ID: " + id + ", Error: " + e.getMessage());
                 }
             }
         }
@@ -621,9 +629,11 @@ public class CapgoUpdater {
 
             try {
                 this.deleteDirectory(entry, threadToCheck);
-                logger.info("Deleted orphaned temp unzip folder: " + folderName);
+                logger.info("Deleted orphaned temp unzip folder");
+                logger.debug("Folder: " + folderName);
             } catch (IOException e) {
-                logger.error("Failed to delete orphaned temp folder: " + folderName + " " + e.getMessage());
+                logger.error("Failed to delete orphaned temp folder");
+                logger.debug("Folder: " + folderName + ", Error: " + e.getMessage());
             }
         }
     }
@@ -710,7 +720,8 @@ public class CapgoUpdater {
         } catch (Exception e) {
             // Clean up on failure
             downloadFutures.remove(id);
-            logger.error("Error waiting for download: " + e.getMessage());
+            logger.error("Error waiting for download");
+            logger.debug("Error: " + e.getMessage());
             BundleInfo errorBundle = new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "");
             saveBundleInfo(id, errorBundle);
             if (e instanceof IOException) {
@@ -750,12 +761,14 @@ public class CapgoUpdater {
     public Boolean delete(final String id, final Boolean removeInfo) throws IOException {
         final BundleInfo deleted = this.getBundleInfo(id);
         if (deleted.isBuiltin() || this.getCurrentBundleId().equals(id)) {
-            logger.error("Cannot delete " + id);
+            logger.error("Cannot delete current or builtin bundle");
+            logger.debug("Bundle ID: " + id);
             return false;
         }
         final BundleInfo next = this.getNextBundle();
         if (next != null && !next.isDeleted() && !next.isErrorStatus() && next.getId().equals(id)) {
-            logger.error("Cannot delete the next bundle" + id);
+            logger.error("Cannot delete the next bundle");
+            logger.debug("Bundle ID: " + id);
             return false;
         }
         // Cancel download for this version if active
@@ -772,7 +785,8 @@ public class CapgoUpdater {
             }
             return true;
         }
-        logger.error("bundle removed: " + deleted.getVersionName());
+        logger.info("Bundle not found on disk");
+        logger.debug("Version: " + 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);
@@ -943,11 +957,13 @@ public class CapgoUpdater {
                 if (response.isSuccessful()) {
                     logger.info("Rate limit statistic sent");
                 } else {
-                    logger.error("Error sending rate limit statistic: " + response.code());
+                    logger.error("Error sending rate limit statistic");
+                    logger.debug("Response code: " + response.code());
                 }
             }
         } catch (final Exception e) {
-            logger.error("Failed to send rate limit statistic: " + e.getMessage());
+            logger.error("Failed to send rate limit statistic");
+            logger.debug("Error: " + e.getMessage());
         }
     }
 
@@ -1044,7 +1060,8 @@ public class CapgoUpdater {
                 json.put("defaultChannel", channel);
             }
         } catch (JSONException e) {
-            logger.error("Error getLatest JSONException " + e.getMessage());
+            logger.error("Error getting latest version");
+            logger.debug("JSONException: " + e.getMessage());
             final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
@@ -1116,7 +1133,8 @@ public class CapgoUpdater {
             json = this.createInfoObject();
             json.put("channel", channel);
         } catch (JSONException e) {
-            logger.error("Error setChannel JSONException " + e.getMessage());
+            logger.error("Error setting channel");
+            logger.debug("JSONException: " + e.getMessage());
             final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
@@ -1162,7 +1180,8 @@ public class CapgoUpdater {
         try {
             json = this.createInfoObject();
         } catch (JSONException e) {
-            logger.error("Error getChannel JSONException " + e.getMessage());
+            logger.error("Error getting channel");
+            logger.debug("JSONException: " + e.getMessage());
             final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
@@ -1284,7 +1303,8 @@ public class CapgoUpdater {
         try {
             json = this.createInfoObject();
         } catch (JSONException e) {
-            logger.error("Error creating info object: " + e.getMessage());
+            logger.error("Error creating info object");
+            logger.debug("JSONException: " + e.getMessage());
             final Map<String, Object> retError = new HashMap<>();
             retError.put("message", "Cannot get info: " + e);
             retError.put("error", "json_error");
@@ -1304,7 +1324,8 @@ public class CapgoUpdater {
                 }
             }
         } catch (JSONException e) {
-            logger.error("Error adding query parameters: " + e.getMessage());
+            logger.error("Error adding query parameters");
+            logger.debug("JSONException: " + e.getMessage());
         }
 
         Request request = new Request.Builder().url(urlBuilder.build()).get().build();
@@ -1425,7 +1446,8 @@ public class CapgoUpdater {
             json.put("old_version_name", oldVersionName);
             json.put("action", action);
         } catch (JSONException e) {
-            logger.error("Error sendStats JSONException " + e.getMessage());
+            logger.error("Error preparing stats");
+            logger.debug("JSONException: " + e.getMessage());
             return;
         }
 
@@ -1440,7 +1462,8 @@ public class CapgoUpdater {
                 new okhttp3.Callback() {
                     @Override
                     public void onFailure(@NonNull Call call, @NonNull IOException e) {
-                        logger.error("Failed to send stats: " + e.getMessage());
+                        logger.error("Failed to send stats");
+                        logger.debug("Error: " + e.getMessage());
                     }
 
                     @Override
@@ -1452,9 +1475,11 @@ public class CapgoUpdater {
                             }
 
                             if (response.isSuccessful()) {
-                                logger.info("Stats send for \"" + action + "\", version " + versionName);
+                                logger.info("Stats sent successfully");
+                                logger.debug("Action: " + action + ", Version: " + versionName);
                             } else {
-                                logger.error("Error sending stats: " + response.code());
+                                logger.error("Error sending stats");
+                                logger.debug("Response code: " + response.code());
                             }
                         }
                     }
@@ -1481,14 +1506,8 @@ public class CapgoUpdater {
                     result = BundleInfo.fromJSON(stored);
                 }
             } catch (JSONException e) {
-                logger.error(
-                    "Failed to parse info for bundle [" +
-                        trueId +
-                        "] stored value: '" +
-                        this.prefs.getString(trueId + INFO_SUFFIX, "") +
-                        "' error: " +
-                        e.getMessage()
-                );
+                logger.error("Failed to parse bundle info");
+                logger.debug("Bundle ID: " + trueId + ", Error: " + e.getMessage());
                 // Clear corrupted data
                 this.editor.remove(trueId + INFO_SUFFIX);
                 this.editor.commit();

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

@@ -235,14 +235,11 @@ public class CryptoCipher {
                 detectedAlgorithm = "SHA-256";
             } else if (decryptedChecksum.length == 4) {
                 detectedAlgorithm = "CRC32 (deprecated)";
-                logger.error(
-                    "CRC32 checksum detected. This algorithm is deprecated and no longer supported. Please update your CLI to use SHA-256 checksums."
-                );
+                logger.error("CRC32 checksum detected - deprecated algorithm");
             } else {
                 detectedAlgorithm = "unknown (" + decryptedChecksum.length + " bytes)";
-                logger.error(
-                    "Unknown checksum algorithm detected with " + decryptedChecksum.length + " bytes. Expected SHA-256 (32 bytes)."
-                );
+                logger.error("Unknown checksum algorithm detected");
+                logger.debug("Byte count: " + decryptedChecksum.length + ", Expected: 32 (SHA-256)");
             }
             logger.debug(
                 "Decrypted checksum: " +
@@ -255,7 +252,8 @@ public class CryptoCipher {
             );
             return result;
         } catch (GeneralSecurityException e) {
-            logger.error("decryptChecksum fail: " + e.getMessage());
+            logger.error("Checksum decryption failed");
+            logger.debug("Error: " + e.getMessage());
             throw new IOException("Decryption failed: " + e.getMessage());
         }
     }
@@ -286,13 +284,10 @@ public class CryptoCipher {
         String algorithm = detectChecksumAlgorithm(hexChecksum);
         logger.debug(label + ": " + algorithm + " hex format (length: " + hexChecksum.length() + " chars)");
         if (algorithm.contains("CRC32")) {
-            logger.error(
-                "CRC32 checksum detected. This algorithm is deprecated and no longer supported. Please update your CLI to use SHA-256 checksums."
-            );
+            logger.error("CRC32 checksum detected - deprecated algorithm");
         } else if (algorithm.contains("unknown")) {
-            logger.error(
-                "Unknown checksum algorithm detected. Expected SHA-256 (64 hex chars) but got " + hexChecksum.length() + " chars."
-            );
+            logger.error("Unknown checksum algorithm detected");
+            logger.debug("Char count: " + hexChecksum.length() + ", Expected: 64 (SHA-256)");
         }
     }
 
@@ -321,7 +316,8 @@ public class CryptoCipher {
             }
             return hexString.toString();
         } catch (IOException e) {
-            logger.error("Cannot calc checksum v2: " + file.getPath() + " " + e.getMessage());
+            logger.error("Cannot calculate checksum");
+            logger.debug("Path: " + file.getPath() + ", Error: " + e.getMessage());
             return "";
         }
     }

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

@@ -8,7 +8,6 @@ package ee.forgr.capacitor_updater;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
 import java.io.IOException;
@@ -56,11 +55,6 @@ public class DeviceIdHelper {
      * @return Device ID as a lowercase UUID string
      */
     public static String getOrCreateDeviceId(Context context, SharedPreferences legacyPrefs) {
-        // API 23+ required for Android Keystore
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            return getFallbackDeviceId(legacyPrefs);
-        }
-
         try {
             // Try to get device ID from Keystore storage
             String deviceId = getDeviceIdFromKeystore(context);