@capgo/capacitor-updater 7.2.20 → 7.2.21

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

@@ -40,7 +40,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class CapacitorUpdater {
+public class CapgoUpdater {
 
     private static final String AB = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
     private static final SecureRandom rnd = new SecureRandom();
@@ -326,7 +326,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");
+                    Log.e(CapgoUpdater.TAG, "Public key present but no checksum provided");
                     this.sendStats("checksum_required");
                     throw new IOException("Checksum required when public key is present: " + id);
                 }
@@ -339,7 +339,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 + "' '");
+                    Log.e(CapgoUpdater.TAG, "Error checksum '" + checksumDecrypted + "' '" + checksum + "' '");
                     this.sendStats("checksum_fail");
                     throw new IOException("Checksum failed: " + id);
                 }
@@ -348,14 +348,14 @@ public class CapacitorUpdater {
         } catch (Exception e) {
             final Boolean res = this.delete(id);
             if (!res) {
-                Log.i(CapacitorUpdater.TAG, "Double error, cannot cleanup: " + version);
+                Log.i(CapgoUpdater.TAG, "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 +378,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 +390,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;
@@ -546,7 +546,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());
+            Log.i(CapgoUpdater.TAG, "Failed to delete bundle (" + id + ")" + "\nError:\n" + e.toString());
             return false;
         }
     }
@@ -600,12 +600,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());
+        Log.d(CapgoUpdater.TAG, "Fallback bundle is: " + fallback);
+        Log.i(CapgoUpdater.TAG, "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());
+                Log.i(CapgoUpdater.TAG, "Deleted previous bundle: " + fallback.getVersionName());
             }
         }
         this.setFallbackBundle(bundle);
@@ -616,7 +616,7 @@ public class CapacitorUpdater {
     }
 
     public void reset(final boolean internal) {
-        Log.d(CapacitorUpdater.TAG, "reset: " + internal);
+        Log.d(CapgoUpdater.TAG, "reset: " + internal);
         var currentBundleName = this.getCurrentBundle().getVersionName();
         this.setCurrentBundle(new File("public"));
         this.setFallbackBundle(null);
@@ -720,7 +720,7 @@ public class CapacitorUpdater {
             return;
         }
 
-        Log.i(CapacitorUpdater.TAG, "Auto-update parameters: " + json);
+        Log.i(CapgoUpdater.TAG, "Auto-update parameters: " + json);
 
         makeJsonRequest(updateUrl, json, callback);
     }

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

@@ -135,11 +135,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");
+            Log.i(CapgoUpdater.TAG, "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");
+            Log.e(CapgoUpdater.TAG, "The public key is not a valid RSA Public key");
             return;
         }
 
@@ -168,7 +168,7 @@ public class CryptoCipherV2 {
                 }
             }
         } catch (GeneralSecurityException e) {
-            Log.i(CapacitorUpdater.TAG, "decryptFile fail");
+            Log.i(CapgoUpdater.TAG, "decryptFile fail");
             e.printStackTrace();
             throw new IOException("GeneralSecurityException");
         }
@@ -176,7 +176,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");
+            Log.e(CapgoUpdater.TAG, "No encryption set (public key) ignored");
             return checksum;
         }
         try {
@@ -187,7 +187,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());
+            Log.e(CapgoUpdater.TAG, "decryptChecksum fail: " + e.getMessage());
             throw new IOException("Decryption failed: " + e.getMessage());
         }
     }
@@ -198,7 +198,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");
+            System.err.println(CapgoUpdater.TAG + " SHA-256 algorithm not available");
             return "";
         }
 
@@ -217,7 +217,7 @@ public class CryptoCipherV2 {
             }
             return hexString.toString();
         } catch (IOException e) {
-            System.err.println(CapacitorUpdater.TAG + " Cannot calc checksum v2: " + file.getPath() + " " + e.getMessage());
+            System.err.println(CapgoUpdater.TAG + " Cannot calc checksum v2: " + file.getPath() + " " + e.getMessage());
             return "";
         }
     }

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

@@ -55,7 +55,7 @@ public class DelayUpdateUtils {
                             longValue = Long.parseLong(value);
                         } catch (NumberFormatException e) {
                             Log.e(
-                                CapacitorUpdater.TAG,
+                                CapgoUpdater.TAG,
                                 "Background condition (value: " +
                                 value +
                                 ") had an invalid value at index " +
@@ -66,7 +66,7 @@ public class DelayUpdateUtils {
 
                         if (delta > longValue) {
                             Log.i(
-                                CapacitorUpdater.TAG,
+                                CapgoUpdater.TAG,
                                 "Background condition (value: " +
                                 value +
                                 ") deleted at index " +
@@ -80,7 +80,7 @@ public class DelayUpdateUtils {
                     } else {
                         delayConditionListToKeep.add(condition);
                         Log.i(
-                            CapacitorUpdater.TAG,
+                            CapgoUpdater.TAG,
                             "Background delay (value: " +
                             value +
                             ") condition kept at index " +
@@ -97,7 +97,7 @@ public class DelayUpdateUtils {
                     } else {
                         delayConditionListToKeep.add(condition);
                         Log.i(
-                            CapacitorUpdater.TAG,
+                            CapgoUpdater.TAG,
                             "Kill delay (value: " + value + ") condition kept at index " + index + " (source: " + source.toString() + ")"
                         );
                     }
@@ -110,25 +110,22 @@ public class DelayUpdateUtils {
                             assert date != null;
                             if (new Date().compareTo(date) > 0) {
                                 Log.i(
-                                    CapacitorUpdater.TAG,
+                                    CapgoUpdater.TAG,
                                     "Date delay (value: " + value + ") condition removed due to expired date at index " + index
                                 );
                             } else {
                                 delayConditionListToKeep.add(condition);
-                                Log.i(CapacitorUpdater.TAG, "Date delay (value: " + value + ") condition kept at index " + index);
+                                Log.i(CapgoUpdater.TAG, "Date delay (value: " + value + ") condition kept at index " + index);
                             }
                         } catch (final Exception e) {
                             Log.e(
-                                CapacitorUpdater.TAG,
+                                CapgoUpdater.TAG,
                                 "Date delay (value: " + value + ") condition removed due to parsing issue at index " + index,
                                 e
                             );
                         }
                     } else {
-                        Log.d(
-                            CapacitorUpdater.TAG,
-                            "Date delay (value: " + value + ") condition removed due to empty value at index " + index
-                        );
+                        Log.d(CapgoUpdater.TAG, "Date delay (value: " + value + ") condition removed due to empty value at index " + index);
                     }
                     break;
                 case DelayUntilNext.nativeVersion:
@@ -137,23 +134,23 @@ public class DelayUpdateUtils {
                             final Version versionLimit = new Version(value);
                             if (this.currentVersionNative.isAtLeast(versionLimit)) {
                                 Log.i(
-                                    CapacitorUpdater.TAG,
+                                    CapgoUpdater.TAG,
                                     "Native version delay (value: " + value + ") condition removed due to above limit at index " + index
                                 );
                             } else {
                                 delayConditionListToKeep.add(condition);
-                                Log.i(CapacitorUpdater.TAG, "Native version delay (value: " + value + ") condition kept at index " + index);
+                                Log.i(CapgoUpdater.TAG, "Native version delay (value: " + value + ") condition kept at index " + index);
                             }
                         } catch (final Exception e) {
                             Log.e(
-                                CapacitorUpdater.TAG,
+                                CapgoUpdater.TAG,
                                 "Native version delay (value: " + value + ") condition removed due to parsing issue at index " + index,
                                 e
                             );
                         }
                     } else {
                         Log.d(
-                            CapacitorUpdater.TAG,
+                            CapgoUpdater.TAG,
                             "Native version delay (value: " + value + ") condition removed due to empty value at index " + index
                         );
                     }
@@ -171,10 +168,10 @@ public class DelayUpdateUtils {
         try {
             this.editor.putString(DELAY_CONDITION_PREFERENCES, delayConditions);
             this.editor.commit();
-            Log.i(CapacitorUpdater.TAG, "Delay update saved");
+            Log.i(CapgoUpdater.TAG, "Delay update saved");
             return true;
         } catch (final Exception e) {
-            Log.e(CapacitorUpdater.TAG, "Failed to delay update, [Error calling '_setMultiDelay()']", e);
+            Log.e(CapgoUpdater.TAG, "Failed to delay update, [Error calling '_setMultiDelay()']", e);
             return false;
         }
     }
@@ -183,9 +180,9 @@ public class DelayUpdateUtils {
         try {
             this.editor.putLong(BACKGROUND_TIMESTAMP_KEY, backgroundTimestamp);
             this.editor.commit();
-            Log.i(CapacitorUpdater.TAG, "Delay update saved");
+            Log.i(CapgoUpdater.TAG, "Delay update saved");
         } catch (final Exception e) {
-            Log.e(CapacitorUpdater.TAG, "Failed to delay update, [Error calling '_setBackgroundTimestamp()']", e);
+            Log.e(CapgoUpdater.TAG, "Failed to delay update, [Error calling '_setBackgroundTimestamp()']", e);
         }
     }
 
@@ -193,9 +190,9 @@ public class DelayUpdateUtils {
         try {
             this.editor.remove(BACKGROUND_TIMESTAMP_KEY);
             this.editor.commit();
-            Log.i(CapacitorUpdater.TAG, "Delay update saved");
+            Log.i(CapgoUpdater.TAG, "Delay update saved");
         } catch (final Exception e) {
-            Log.e(CapacitorUpdater.TAG, "Failed to delay update, [Error calling '_unsetBackgroundTimestamp()']", e);
+            Log.e(CapgoUpdater.TAG, "Failed to delay update, [Error calling '_unsetBackgroundTimestamp()']", e);
         }
     }
 
@@ -203,7 +200,7 @@ public class DelayUpdateUtils {
         try {
             return this.prefs.getLong(BACKGROUND_TIMESTAMP_KEY, 0);
         } catch (final Exception e) {
-            Log.e(CapacitorUpdater.TAG, "Failed to delay update, [Error calling '_getBackgroundTimestamp()']", e);
+            Log.e(CapgoUpdater.TAG, "Failed to delay update, [Error calling '_getBackgroundTimestamp()']", e);
             return 0;
         }
     }
@@ -212,10 +209,10 @@ public class DelayUpdateUtils {
         try {
             this.editor.remove(DELAY_CONDITION_PREFERENCES);
             this.editor.commit();
-            Log.i(CapacitorUpdater.TAG, "All delays canceled from " + source);
+            Log.i(CapgoUpdater.TAG, "All delays canceled from " + source);
             return true;
         } catch (final Exception e) {
-            Log.e(CapacitorUpdater.TAG, "Failed to cancel update delay", e);
+            Log.e(CapgoUpdater.TAG, "Failed to cancel update delay", e);
             return false;
         }
     }

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

@@ -409,7 +409,7 @@ public class DownloadService extends Worker {
             }
 
             if (!publicKey.isEmpty() && sessionKey != null && !sessionKey.isEmpty()) {
-                Log.d(CapacitorUpdater.TAG + " DLSrv", "Decrypting file " + targetFile.getName());
+                Log.d(CapgoUpdater.TAG + " DLSrv", "Decrypting file " + targetFile.getName());
                 CryptoCipherV2.decryptFile(compressedFile, publicKey, sessionKey);
             }
 

package/ios/Plugin/AES.swift

@@ -56,11 +56,11 @@ public struct AES128Key {
                 result.length = Int(decryptedLength)
                 return result as Data
             } else {
-                print("\(CapacitorUpdater.TAG) AES decryption failed with status: \(status)")
+                print("\(CapgoUpdater.TAG) AES decryption failed with status: \(status)")
                 return nil
             }
         } else {
-            print("\(CapacitorUpdater.TAG) Failed to allocate memory for AES decryption")
+            print("\(CapgoUpdater.TAG) Failed to allocate memory for AES decryption")
             return nil
         }
     }