@capgo/capacitor-updater 7.17.2 → 7.17.3

package/android/build.gradle

@@ -57,9 +57,9 @@ dependencies {
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation 'io.github.g00fy2:versioncompare:1.5.0'
-    implementation 'com.google.code.gson:gson:2.13.2'
     testImplementation "junit:junit:$junitVersion"
     testImplementation 'org.mockito:mockito-core:5.14.2'
+    testImplementation 'org.json:json:20250517'
     testImplementation 'org.robolectric:robolectric:4.13'
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

package/android/proguard-rules.pro

@@ -20,15 +20,12 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
-# Necessary for Gson Deserialization and generic type info
+# Preserve annotation and signature metadata used by runtime checks
 -keepattributes *Annotation*, Signature
 
 # Preserve the entire Capgo plugin package
 -keep class ee.forgr.capacitor_updater.** { *; }
 
-# Keep all Guava reflect types (required for TypeToken)
--keep class com.google.common.reflect.** { *; }
-
 # Preserve Capacitor classes and members accessed via reflection for autoSplashscreen
 # These rules are safe even if SplashScreen plugin is not present - they only reference core Capacitor classes
 -keep class com.getcapacitor.Bridge {
@@ -46,6 +43,3 @@
 -keep class * implements com.getcapacitor.PluginHandle {
     public void invoke(java.lang.String, com.getcapacitor.PluginCall);
 }
--keepattributes Signature
--keep class com.google.common.reflect.TypeToken
--keep class com.google.common.reflect.TypeToken$TypeSet

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

@@ -23,11 +23,8 @@ import com.getcapacitor.PluginHandle;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.plugin.WebView;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
 import io.github.g00fy2.versioncompare.Version;
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -60,7 +57,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String statsUrlDefault = "https://plugin.capgo.app/stats";
     private static final String channelUrlDefault = "https://plugin.capgo.app/channel_self";
 
-    private final String PLUGIN_VERSION = "7.17.2";
+    private final String PLUGIN_VERSION = "7.17.3";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -1363,14 +1360,14 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                     if (latest.isDownloaded()) {
                                         logger.info("Latest bundle already exists and download is NOT required. " + messageUpdate);
                                         if (shouldDirectUpdate) {
-                                            Gson gson = new Gson();
                                             String delayUpdatePreferences = prefs.getString(
                                                 DelayUpdateUtils.DELAY_CONDITION_PREFERENCES,
                                                 "[]"
                                             );
-                                            Type type = new TypeToken<ArrayList<DelayCondition>>() {}.getType();
-                                            ArrayList<DelayCondition> delayConditionList = gson.fromJson(delayUpdatePreferences, type);
-                                            if (delayConditionList != null && !delayConditionList.isEmpty()) {
+                                            ArrayList<DelayCondition> delayConditionList = delayUpdateUtils.parseDelayConditions(
+                                                delayUpdatePreferences
+                                            );
+                                            if (!delayConditionList.isEmpty()) {
                                                 logger.info("Update delayed until delay conditions met");
                                                 CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
                                                     "Update delayed until delay conditions met",
@@ -1498,11 +1495,9 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
     private void installNext() {
         try {
-            Gson gson = new Gson();
             String delayUpdatePreferences = prefs.getString(DelayUpdateUtils.DELAY_CONDITION_PREFERENCES, "[]");
-            Type type = new TypeToken<ArrayList<DelayCondition>>() {}.getType();
-            ArrayList<DelayCondition> delayConditionList = gson.fromJson(delayUpdatePreferences, type);
-            if (delayConditionList != null && !delayConditionList.isEmpty()) {
+            ArrayList<DelayCondition> delayConditionList = delayUpdateUtils.parseDelayConditions(delayUpdatePreferences);
+            if (!delayConditionList.isEmpty()) {
                 logger.info("Update delayed until delay conditions met");
                 return;
             }

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

@@ -7,15 +7,12 @@
 package ee.forgr.capacitor_updater;
 
 import androidx.annotation.NonNull;
-import com.google.gson.annotations.SerializedName;
 import java.util.Objects;
 
 public class DelayCondition {
 
-    @SerializedName("kind")
     private DelayUntilNext kind;
 
-    @SerializedName("value")
     private String value;
 
     public DelayCondition(DelayUntilNext kind, String value) {

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

@@ -1,13 +1,13 @@
 package ee.forgr.capacitor_updater;
 
 import android.content.SharedPreferences;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
 import io.github.g00fy2.versioncompare.Version;
-import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class DelayUpdateUtils {
 
@@ -42,10 +42,8 @@ public class DelayUpdateUtils {
     }
 
     public void checkCancelDelay(CancelDelaySource source) {
-        Gson gson = new Gson();
         String delayUpdatePreferences = prefs.getString(DELAY_CONDITION_PREFERENCES, "[]");
-        Type type = new TypeToken<ArrayList<DelayCondition>>() {}.getType();
-        ArrayList<DelayCondition> delayConditionList = gson.fromJson(delayUpdatePreferences, type);
+        ArrayList<DelayCondition> delayConditionList = parseDelayConditions(delayUpdatePreferences);
         ArrayList<DelayCondition> delayConditionListToKeep = new ArrayList<>(delayConditionList.size());
         int index = 0;
 
@@ -163,10 +161,56 @@ public class DelayUpdateUtils {
         }
 
         if (!delayConditionListToKeep.isEmpty()) {
-            this.setMultiDelay(gson.toJson(delayConditionListToKeep));
+            this.setMultiDelay(convertDelayConditionsToJson(delayConditionListToKeep));
         }
     }
 
+    public ArrayList<DelayCondition> parseDelayConditions(String json) {
+        ArrayList<DelayCondition> conditions = new ArrayList<>();
+        if (json == null || json.isEmpty()) {
+            return conditions;
+        }
+        try {
+            JSONArray array = new JSONArray(json);
+            for (int i = 0; i < array.length(); i++) {
+                JSONObject item = array.optJSONObject(i);
+                if (item == null) {
+                    continue;
+                }
+                String kindValue = item.optString("kind", "");
+                String value = item.optString("value", "");
+                if (kindValue.isEmpty()) {
+                    logger.warn("Delay condition missing kind at index " + i);
+                    continue;
+                }
+                try {
+                    DelayUntilNext kind = DelayUntilNext.valueOf(kindValue);
+                    conditions.add(new DelayCondition(kind, value));
+                } catch (IllegalArgumentException e) {
+                    logger.warn("Unknown delay condition kind '" + kindValue + "' at index " + i);
+                }
+            }
+        } catch (JSONException e) {
+            logger.error("Failed to parse delay conditions: " + e.getMessage());
+        }
+        return conditions;
+    }
+
+    private String convertDelayConditionsToJson(ArrayList<DelayCondition> conditions) {
+        JSONArray array = new JSONArray();
+        for (DelayCondition condition : conditions) {
+            try {
+                JSONObject obj = new JSONObject();
+                obj.put("kind", condition.getKind().name());
+                obj.put("value", condition.getValue());
+                array.put(obj);
+            } catch (JSONException e) {
+                logger.error("Failed to serialize delay condition: " + e.getMessage());
+            }
+        }
+        return array.toString();
+    }
+
     public Boolean setMultiDelay(String delayConditions) {
         try {
             this.editor.putString(DELAY_CONDITION_PREFERENCES, delayConditions);

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -50,7 +50,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let PLUGIN_VERSION: String = "7.17.2"
+    private let PLUGIN_VERSION: String = "7.17.3"
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
     static let channelUrlDefault = "https://plugin.capgo.app/channel_self"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "7.17.2",
+  "version": "7.17.3",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",