@capgo/capacitor-updater 8.0.1 → 8.1.0

package/android/build.gradle

@@ -1,8 +1,8 @@
 ext {
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'
 }
 
 buildscript {
@@ -11,18 +11,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.2'
+        classpath 'com.android.tools.build:gradle:8.13.0'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    namespace "ee.forgr.capacitor_updater"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
+    namespace = "ee.forgr.capacitor_updater"
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -49,18 +49,30 @@ repositories {
 
 
 dependencies {
-    def work_version = "2.10.0"
+    def work_version = "2.10.5"
     implementation "androidx.work:work-runtime:$work_version"
-    implementation "com.google.android.gms:play-services-tasks:18.2.0"
-    implementation "com.google.guava:guava:32.1.3-jre"
+    implementation "com.google.android.gms:play-services-tasks:18.4.0"
+    implementation "com.google.guava:guava:33.5.0-android"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation 'io.github.g00fy2:versioncompare:1.5.0'
-    implementation 'com.google.code.gson:gson:2.11.0'
     testImplementation "junit:junit:$junitVersion"
+    testImplementation 'org.mockito:mockito-core:5.20.0'
+    testImplementation 'org.json:json:20250517'
+    testImplementation 'org.robolectric:robolectric:4.13'
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation 'org.brotli:dec:0.1.2'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 }
+
+tasks.withType(Test) {
+    testLogging {
+        events "passed", "skipped", "failed", "standardOut", "standardError"
+        exceptionFormat "full"
+        showStandardStreams = true
+        showCauses = true
+        showStackTraces = true
+    }
+}

package/android/proguard-rules.pro

@@ -20,9 +20,26 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
-# Necessary for Gson Deserialization
--keepattributes *Annotation*
+# Preserve annotation and signature metadata used by runtime checks
+-keepattributes *Annotation*, Signature
 
-# Necessary for Gson Deserialization
--keep class ee.forgr.capacitor_updater.DelayCondition { *; }
--keepattributes Signature
+# Preserve the entire Capgo plugin package
+-keep class ee.forgr.capacitor_updater.** { *; }
+
+# 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 {
+    com.getcapacitor.MessageHandler msgHandler;
+}
+
+-keep class com.getcapacitor.MessageHandler { *; }
+
+-keep class com.getcapacitor.PluginCall {
+    <init>(com.getcapacitor.MessageHandler, java.lang.String, java.lang.String, java.lang.String, com.getcapacitor.JSObject);
+}
+
+# Keep SplashScreen plugin methods that are called via reflection
+# This applies to any plugin, not just SplashScreen
+-keep class * implements com.getcapacitor.PluginHandle {
+    public void invoke(java.lang.String, com.getcapacitor.PluginCall);
+}

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

@@ -6,9 +6,10 @@
 
 package ee.forgr.capacitor_updater;
 
-import com.getcapacitor.JSObject;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 import java.util.TimeZone;
 import org.json.JSONException;
@@ -28,25 +29,53 @@ public class BundleInfo {
     private final String version;
     private final String checksum;
     private final BundleStatus status;
+    private final String link;
+    private final String comment;
 
     static {
         sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
     }
 
     public BundleInfo(final BundleInfo source) {
-        this(source.id, source.version, source.status, source.downloaded, source.checksum);
+        this(source.id, source.version, source.status, source.downloaded, source.checksum, source.link, source.comment);
     }
 
     public BundleInfo(final String id, final String version, final BundleStatus status, final Date downloaded, final String checksum) {
-        this(id, version, status, sdf.format(downloaded), checksum);
+        this(id, version, status, sdf.format(downloaded), checksum, null, null);
+    }
+
+    public BundleInfo(
+        final String id,
+        final String version,
+        final BundleStatus status,
+        final Date downloaded,
+        final String checksum,
+        final String link,
+        final String comment
+    ) {
+        this(id, version, status, sdf.format(downloaded), checksum, link, comment);
     }
 
     public BundleInfo(final String id, final String version, final BundleStatus status, final String downloaded, final String checksum) {
-        this.downloaded = downloaded.trim();
-        this.id = id;
+        this(id, version, status, downloaded, checksum, null, null);
+    }
+
+    public BundleInfo(
+        final String id,
+        final String version,
+        final BundleStatus status,
+        final String downloaded,
+        final String checksum,
+        final String link,
+        final String comment
+    ) {
+        this.downloaded = downloaded != null ? downloaded.trim() : "";
+        this.id = id != null ? id : "";
         this.version = version;
-        this.checksum = checksum;
-        this.status = status;
+        this.checksum = checksum != null ? checksum : "";
+        this.status = status != null ? status : BundleStatus.ERROR;
+        this.link = link;
+        this.comment = comment;
     }
 
     public Boolean isBuiltin() {
@@ -70,19 +99,19 @@ public class BundleInfo {
     }
 
     public String getDownloaded() {
-        return this.isBuiltin() ? DOWNLOADED_BUILTIN : this.downloaded;
+        return this.isBuiltin() ? DOWNLOADED_BUILTIN : (this.downloaded != null ? this.downloaded : "");
     }
 
     public BundleInfo setDownloaded(Date downloaded) {
-        return new BundleInfo(this.id, this.version, this.status, downloaded, this.checksum);
+        return new BundleInfo(this.id, this.version, this.status, downloaded, this.checksum, this.link, this.comment);
     }
 
     public String getChecksum() {
-        return this.isBuiltin() ? "" : this.checksum;
+        return this.isBuiltin() ? "" : (this.checksum != null ? this.checksum : "");
     }
 
     public BundleInfo setChecksum(String checksum) {
-        return new BundleInfo(this.id, this.version, this.status, this.downloaded, checksum);
+        return new BundleInfo(this.id, this.version, this.status, this.downloaded, checksum, this.link, this.comment);
     }
 
     public String getId() {
@@ -90,7 +119,7 @@ public class BundleInfo {
     }
 
     public BundleInfo setId(String id) {
-        return new BundleInfo(id, this.version, this.status, this.downloaded, this.checksum);
+        return new BundleInfo(id, this.version, this.status, this.downloaded, this.checksum, this.link, this.comment);
     }
 
     public String getVersionName() {
@@ -98,19 +127,34 @@ public class BundleInfo {
     }
 
     public BundleInfo setVersionName(String version) {
-        return new BundleInfo(this.id, version, this.status, this.downloaded, this.checksum);
+        return new BundleInfo(this.id, version, this.status, this.downloaded, this.checksum, this.link, this.comment);
     }
 
     public BundleStatus getStatus() {
-        return this.isBuiltin() ? BundleStatus.SUCCESS : this.status;
+        if (this.isBuiltin()) {
+            return BundleStatus.SUCCESS;
+        }
+        return this.status != null ? this.status : BundleStatus.ERROR;
     }
 
     public BundleInfo setStatus(BundleStatus status) {
-        return new BundleInfo(this.id, this.version, status, this.downloaded, this.checksum);
+        return new BundleInfo(this.id, this.version, status, this.downloaded, this.checksum, this.link, this.comment);
+    }
+
+    public String getLink() {
+        return this.link;
+    }
+
+    public BundleInfo setLink(String link) {
+        return new BundleInfo(this.id, this.version, this.status, this.downloaded, this.checksum, link, this.comment);
+    }
+
+    public String getComment() {
+        return this.comment;
     }
 
-    public static BundleInfo fromJSON(final JSObject json) throws JSONException {
-        return BundleInfo.fromJSON(json.toString());
+    public BundleInfo setComment(String comment) {
+        return new BundleInfo(this.id, this.version, this.status, this.downloaded, this.checksum, this.link, comment);
     }
 
     public static BundleInfo fromJSON(final String jsonString) throws JSONException {
@@ -120,17 +164,25 @@ public class BundleInfo {
             json.has("version") ? json.getString("version") : BundleInfo.VERSION_UNKNOWN,
             json.has("status") ? BundleStatus.fromString(json.getString("status")) : BundleStatus.PENDING,
             json.has("downloaded") ? json.getString("downloaded") : "",
-            json.has("checksum") ? json.getString("checksum") : ""
+            json.has("checksum") ? json.getString("checksum") : "",
+            json.has("link") ? json.getString("link") : null,
+            json.has("comment") ? json.getString("comment") : null
         );
     }
 
-    public JSObject toJSON() {
-        final JSObject result = new JSObject();
+    public Map<String, Object> toJSONMap() {
+        final Map<String, Object> result = new HashMap<>();
         result.put("id", this.getId());
         result.put("version", this.getVersionName());
         result.put("downloaded", this.getDownloaded());
         result.put("checksum", this.getChecksum());
-        result.put("status", this.getStatus());
+        result.put("status", this.getStatus().toString());
+        if (this.link != null && !this.link.isEmpty()) {
+            result.put("link", this.link);
+        }
+        if (this.comment != null && !this.comment.isEmpty()) {
+            result.put("comment", this.comment);
+        }
         return result;
     }
 
@@ -149,6 +201,42 @@ public class BundleInfo {
 
     @Override
     public String toString() {
-        return this.toJSON().toString();
+        try {
+            // Build JSON manually with extra safety checks
+            StringBuilder json = new StringBuilder();
+            json.append("{");
+
+            // Safe ID access
+            String safeId = this.id != null ? this.id : "";
+            if (this.isBuiltin()) safeId = ID_BUILTIN;
+            json.append("\"id\":\"").append(safeId).append("\",");
+
+            // Safe version access
+            String safeVersion = this.version != null ? this.version : ID_BUILTIN;
+            json.append("\"version\":\"").append(safeVersion).append("\",");
+
+            // Safe downloaded access
+            String safeDownloaded = this.downloaded != null ? this.downloaded : "";
+            if (this.isBuiltin()) safeDownloaded = DOWNLOADED_BUILTIN;
+            json.append("\"downloaded\":\"").append(safeDownloaded).append("\",");
+
+            // Safe checksum access
+            String safeChecksum = this.checksum != null ? this.checksum : "";
+            json.append("\"checksum\":\"").append(safeChecksum).append("\",");
+
+            // Safe status access
+            BundleStatus safeStatus = this.status != null ? this.status : BundleStatus.ERROR;
+            if (this.isBuiltin()) safeStatus = BundleStatus.SUCCESS;
+            json.append("\"status\":\"").append(safeStatus.toString()).append("\"");
+
+            json.append("}");
+            return json.toString();
+        } catch (Exception e) {
+            // Log the error for debugging but still return valid JSON
+            System.err.println("BundleInfo toString() error: " + e.getMessage());
+            e.printStackTrace();
+            // Return absolute minimal JSON
+            return "{\"id\":\"" + (this.id != null ? this.id : "unknown") + "\",\"status\":\"error\"}";
+        }
     }
 }

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

@@ -6,8 +6,8 @@
 
 package ee.forgr.capacitor_updater;
 
-import com.getcapacitor.JSObject;
+import java.util.Map;
 
 public interface Callback {
-    void callback(JSObject jsoObject);
+    void callback(Map<String, Object> result);
 }