@capgo/capacitor-updater 4.58.0 → 4.61.1

package/android/src/main/AndroidManifest.xml

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

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

@@ -342,14 +342,14 @@ public class CapacitorUpdater {
       this.flattenAssets(unzipped, idName);
       this.notifyDownload(id, 100);
       this.saveBundleInfo(id, null);
-      BundleInfo info = new BundleInfo(
+      BundleInfo next = new BundleInfo(
         id,
         version,
         BundleStatus.PENDING,
         new Date(System.currentTimeMillis()),
         checksum
       );
-      this.saveBundleInfo(id, info);
+      this.saveBundleInfo(id, next);
       if (
         checksumRes != null &&
         !checksumRes.isEmpty() &&
@@ -357,23 +357,23 @@ public class CapacitorUpdater {
       ) {
         Log.e(
           CapacitorUpdater.TAG,
-          "Error checksum " + info.getChecksum() + " " + checksum
+          "Error checksum " + next.getChecksum() + " " + checksum
         );
         this.sendStats("checksum_fail", getCurrentBundle().getVersionName());
-        final Boolean res = this.delete(info.getId());
+        final Boolean res = this.delete(id);
         if (res) {
           Log.i(
             CapacitorUpdater.TAG,
-            "Failed bundle deleted: " + info.getVersionName()
+            "Failed bundle deleted: " + next.getVersionName()
           );
         }
-        return;
+        throw new IOException("Checksum failed: " + id);
       }
       final JSObject ret = new JSObject();
-      ret.put("bundle", info.toJSON());
+      ret.put("bundle", next.toJSON());
       CapacitorUpdater.this.notifyListeners("updateAvailable", ret);
       if (setNext) {
-        this.setNextBundle(info.getId());
+        this.setNextBundle(next.getId());
       }
     } catch (IOException e) {
       e.printStackTrace();

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

@@ -55,7 +55,7 @@ public class CapacitorUpdaterPlugin
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "4.58.0";
+  private final String PLUGIN_VERSION = "4.61.1";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -15,7 +15,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     private var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "4.58.0"
+    private let PLUGIN_VERSION: String = "4.61.1"
     static let updateUrlDefault = "https://api.capgo.app/updates"
     static let statsUrlDefault = "https://api.capgo.app/stats"
     static let channelUrlDefault = "https://api.capgo.app/channel_self"
@@ -129,11 +129,12 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                 if checksum != "" && next.getChecksum() != checksum {
                     print("\(self.implementation.TAG) Error checksum", next.getChecksum(), checksum)
                     self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
-                    let resDel = self.implementation.delete(id: next.getId())
+                    let id = next.getId()
+                    let resDel = self.implementation.delete(id: id)
                     if !resDel {
-                        print("\(self.implementation.TAG) Delete failed, id \(next.getId()) doesn't exist")
+                        print("\(self.implementation.TAG) Delete failed, id \(id) doesn't exist")
                     }
-                    return
+                    throw ObjectSavableError.checksum
                 }
                 self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
                 call.resolve(next.toJSON())
@@ -560,12 +561,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                     if res.checksum != "" && next.getChecksum() != res.checksum {
                         print("\(self.implementation.TAG) Error checksum", next.getChecksum(), res.checksum)
                         self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
-                        let resDel = self.implementation.delete(id: next.getId())
+                        let id = next.getId()
+                        let resDel = self.implementation.delete(id: id)
                         if !resDel {
-                            print("\(self.implementation.TAG) Delete failed, id \(next.getId()) doesn't exist")
+                            print("\(self.implementation.TAG) Delete failed, id \(id) doesn't exist")
                         }
                         self.endBackGroundTask()
-                        return
+                        throw ObjectSavableError.checksum
                     }
                     self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
                     _ = self.implementation.setNextBundle(next: next.getId())

package/ios/Plugin/UserDefaultsExtension.swift

@@ -15,6 +15,7 @@ enum ObjectSavableError: String, LocalizedError {
     case unableToEncode = "Unable to encode object into data"
     case noValue = "No data object found for the given key"
     case unableToDecode = "Unable to decode object into given type"
+    case checksum = "Checksum failed"
 
     var errorDescription: String? {
         rawValue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.58.0",
+  "version": "4.61.1",
   "packageManager": "pnpm@8.3.1",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
@@ -53,11 +53,11 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^4.7.3",
-    "@capacitor/cli": "^4.7.3",
-    "@capacitor/core": "^4.7.3",
+    "@capacitor/android": "^4.8.0",
+    "@capacitor/cli": "^4.8.0",
+    "@capacitor/core": "^4.8.0",
     "@capacitor/docgen": "^0.2.1",
-    "@capacitor/ios": "^4.7.3",
+    "@capacitor/ios": "^4.8.0",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^2.0.0",
     "@ionic/swiftlint-config": "^1.1.2",
@@ -68,13 +68,13 @@
     "eslint-plugin-import": "^2.27.5",
     "prettier": "^2.8.7",
     "prettier-plugin-java": "^2.1.0",
-    "rimraf": "^4.4.1",
+    "rimraf": "^5.0.0",
     "rollup": "^3.20.7",
     "swiftlint": "^1.0.1",
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "@capacitor/core": "^4.0.0 || ^5.0.0"
+    "@capacitor/core": "^5.0.0"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",