@capgo/capacitor-updater 8.0.0 → 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.6.1'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.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.0.1'
+        classpath 'com.android.tools.build:gradle:8.13.0'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    namespace "ee.forgr.capacitor_updater"
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
+    namespace = "ee.forgr.capacitor_updater"
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
+        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"
@@ -37,8 +37,8 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 }
 
@@ -49,13 +49,30 @@ repositories {
 
 
 dependencies {
+    def work_version = "2.10.5"
+    implementation "androidx.work:work-runtime:$work_version"
+    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 'com.android.volley:volley:1.2.1'
     implementation 'io.github.g00fy2:versioncompare:1.5.0'
-    implementation 'com.google.code.gson:gson:2.10.1'
     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

@@ -0,0 +1,45 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+
+# Preserve annotation and signature metadata used by runtime checks
+-keepattributes *Annotation*, 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/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
-        <service android:name="ee.forgr.capacitor_updater.DownloadService" />
     </application>
 </manifest>

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;
@@ -17,198 +18,225 @@ import org.json.JSONTokener;
 
 public class BundleInfo {
 
-  private static final SimpleDateFormat sdf = new SimpleDateFormat(
-    "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
-  );
-
-  public static final String ID_BUILTIN = "builtin";
-  public static final String VERSION_UNKNOWN = "unknown";
-  public static final String DOWNLOADED_BUILTIN = "1970-01-01T00:00:00.000Z";
-
-  private final String downloaded;
-  private final String id;
-  private final String version;
-  private final String checksum;
-  private final BundleStatus status;
-
-  static {
-    sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
-  }
-
-  public BundleInfo(final BundleInfo source) {
-    this(
-      source.id,
-      source.version,
-      source.status,
-      source.downloaded,
-      source.checksum
-    );
-  }
-
-  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);
-  }
-
-  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.version = version;
-    this.checksum = checksum;
-    this.status = status;
-  }
-
-  public Boolean isBuiltin() {
-    return ID_BUILTIN.equals(this.id);
-  }
-
-  public Boolean isUnknown() {
-    return VERSION_UNKNOWN.equals(this.id);
-  }
-
-  public Boolean isErrorStatus() {
-    return BundleStatus.ERROR == this.status;
-  }
-
-  public Boolean isDeleted() {
-    return BundleStatus.DELETED == this.status;
-  }
-
-  public boolean isDownloaded() {
-    return (
-      !this.isBuiltin() &&
-      this.downloaded != null &&
-      !this.downloaded.isEmpty() &&
-      !this.isDeleted()
-    );
-  }
-
-  public String getDownloaded() {
-    return this.isBuiltin() ? DOWNLOADED_BUILTIN : this.downloaded;
-  }
-
-  public BundleInfo setDownloaded(Date downloaded) {
-    return new BundleInfo(
-      this.id,
-      this.version,
-      this.status,
-      downloaded,
-      this.checksum
-    );
-  }
-
-  public String getChecksum() {
-    return this.isBuiltin() ? "" : this.checksum;
-  }
-
-  public BundleInfo setChecksum(String checksum) {
-    return new BundleInfo(
-      this.id,
-      this.version,
-      this.status,
-      this.downloaded,
-      checksum
-    );
-  }
-
-  public String getId() {
-    return this.isBuiltin() ? ID_BUILTIN : this.id;
-  }
-
-  public BundleInfo setId(String id) {
-    return new BundleInfo(
-      id,
-      this.version,
-      this.status,
-      this.downloaded,
-      this.checksum
-    );
-  }
-
-  public String getVersionName() {
-    return this.version == null ? ID_BUILTIN : this.version;
-  }
-
-  public BundleInfo setVersionName(String version) {
-    return new BundleInfo(
-      this.id,
-      version,
-      this.status,
-      this.downloaded,
-      this.checksum
-    );
-  }
-
-  public BundleStatus getStatus() {
-    return this.isBuiltin() ? BundleStatus.SUCCESS : this.status;
-  }
-
-  public BundleInfo setStatus(BundleStatus status) {
-    return new BundleInfo(
-      this.id,
-      this.version,
-      status,
-      this.downloaded,
-      this.checksum
-    );
-  }
-
-  public static BundleInfo fromJSON(final JSObject json) throws JSONException {
-    return BundleInfo.fromJSON(json.toString());
-  }
-
-  public static BundleInfo fromJSON(final String jsonString)
-    throws JSONException {
-    JSONObject json = new JSONObject(new JSONTokener(jsonString));
-    return new BundleInfo(
-      json.has("id") ? json.getString("id") : "",
-      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") : ""
-    );
-  }
-
-  public JSObject toJSON() {
-    final JSObject result = new JSObject();
-    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());
-    return result;
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (!(o instanceof BundleInfo)) return false;
-    final BundleInfo that = (BundleInfo) o;
-    return this.getId().equals(that.getId());
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(this.version);
-  }
-
-  @Override
-  public String toString() {
-    return this.toJSON().toString();
-  }
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+
+    public static final String ID_BUILTIN = "builtin";
+    public static final String VERSION_UNKNOWN = "unknown";
+    public static final String DOWNLOADED_BUILTIN = "1970-01-01T00:00:00.000Z";
+
+    private final String downloaded;
+    private final String id;
+    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, 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, 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(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 != null ? checksum : "";
+        this.status = status != null ? status : BundleStatus.ERROR;
+        this.link = link;
+        this.comment = comment;
+    }
+
+    public Boolean isBuiltin() {
+        return ID_BUILTIN.equals(this.id);
+    }
+
+    public Boolean isUnknown() {
+        return VERSION_UNKNOWN.equals(this.id);
+    }
+
+    public Boolean isErrorStatus() {
+        return BundleStatus.ERROR == this.status;
+    }
+
+    public Boolean isDeleted() {
+        return BundleStatus.DELETED == this.status;
+    }
+
+    public boolean isDownloaded() {
+        return (!this.isBuiltin() && this.downloaded != null && !this.downloaded.isEmpty() && !this.isDeleted());
+    }
+
+    public String getDownloaded() {
+        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, this.link, this.comment);
+    }
+
+    public String getChecksum() {
+        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, this.link, this.comment);
+    }
+
+    public String getId() {
+        return this.isBuiltin() ? ID_BUILTIN : this.id;
+    }
+
+    public BundleInfo setId(String id) {
+        return new BundleInfo(id, this.version, this.status, this.downloaded, this.checksum, this.link, this.comment);
+    }
+
+    public String getVersionName() {
+        return this.version == null ? ID_BUILTIN : this.version;
+    }
+
+    public BundleInfo setVersionName(String version) {
+        return new BundleInfo(this.id, version, this.status, this.downloaded, this.checksum, this.link, this.comment);
+    }
+
+    public BundleStatus getStatus() {
+        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, 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 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 {
+        JSONObject json = new JSONObject(new JSONTokener(jsonString));
+        return new BundleInfo(
+            json.has("id") ? json.getString("id") : "",
+            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("link") ? json.getString("link") : null,
+            json.has("comment") ? json.getString("comment") : null
+        );
+    }
+
+    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().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;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (!(o instanceof BundleInfo)) return false;
+        final BundleInfo that = (BundleInfo) o;
+        return this.getId().equals(that.getId());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.version);
+    }
+
+    @Override
+    public String 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/BundleStatus.java

@@ -10,35 +10,35 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum BundleStatus {
-  SUCCESS("success"),
-  ERROR("error"),
-  PENDING("pending"),
-  DELETED("deleted"),
-  DOWNLOADING("downloading");
+    SUCCESS("success"),
+    ERROR("error"),
+    PENDING("pending"),
+    DELETED("deleted"),
+    DOWNLOADING("downloading");
 
-  public final String label;
+    public final String label;
 
-  private static final Map<String, BundleStatus> BY_LABEL = new HashMap<>();
+    private static final Map<String, BundleStatus> BY_LABEL = new HashMap<>();
 
-  static {
-    for (final BundleStatus e : values()) {
-      BY_LABEL.put(e.label, e);
+    static {
+        for (final BundleStatus e : values()) {
+            BY_LABEL.put(e.label, e);
+        }
     }
-  }
 
-  BundleStatus(final String label) {
-    this.label = label;
-  }
+    BundleStatus(final String label) {
+        this.label = label;
+    }
 
-  @Override
-  public String toString() {
-    return this.label;
-  }
+    @Override
+    public String toString() {
+        return this.label;
+    }
 
-  public static BundleStatus fromString(final String status) {
-    if (status == null || status.isEmpty()) {
-      return BundleStatus.PENDING;
+    public static BundleStatus fromString(final String status) {
+        if (status == null || status.isEmpty()) {
+            return BundleStatus.PENDING;
+        }
+        return BundleStatus.BY_LABEL.get(status);
     }
-    return BundleStatus.BY_LABEL.get(status);
-  }
 }

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

@@ -0,0 +1,13 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package ee.forgr.capacitor_updater;
+
+import java.util.Map;
+
+public interface Callback {
+    void callback(Map<String, Object> result);
+}