@capgo/capacitor-updater 4.17.27 → 4.17.31

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

@@ -198,7 +198,7 @@ public class CapacitorUpdater {
           );
         }
 
-        final int newPercent = (int) ((lengthRead * 100) / lengthTotal);
+        final int newPercent = (int) ((lengthRead / (float) lengthTotal) * 100);
         if (lengthTotal > 1 && newPercent != percent) {
           percent = newPercent;
           this.notifyDownload(id, this.calcTotalPercent(percent, 75, 90));
@@ -424,7 +424,7 @@ public class CapacitorUpdater {
     this.notifyDownload(id, 10);
     while ((length = dis.read(buffer)) > 0) {
       fos.write(buffer, 0, length);
-      final int newPercent = (int) ((bytesRead * 100) / totalLength);
+      final int newPercent = (int) ((bytesRead / (float) totalLength) * 100);
       if (totalLength > 1 && newPercent != percent) {
         percent = newPercent;
         this.notifyDownload(id, this.calcTotalPercent(percent, 10, 70));

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

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

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -9,7 +9,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     private var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "4.17.27"
+    private let PLUGIN_VERSION: String = "4.17.31"
     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"
@@ -270,31 +270,34 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     @objc func _reset(toLastSuccessful: Bool) -> Bool {
         guard let bridge = self.bridge else { return false }
 
-        if let vc = bridge.viewController as? CAPBridgeViewController {
+        if (bridge.viewController as? CAPBridgeViewController) != nil {
             let fallback: BundleInfo = self.implementation.getFallbackBundle()
+
+            // If developer wants to reset to the last successful bundle, and that bundle is not
+            // the built-in bundle, set it as the bundle to use and reload.
             if toLastSuccessful && !fallback.isBuiltin() {
                 print("\(self.implementation.TAG) Resetting to: \(fallback.toString())")
                 return self.implementation.set(bundle: fallback) && self._reload()
             }
+
+            print("\(self.implementation.TAG) Resetting to builtin version")
+
+            // Otherwise, reset back to the built-in bundle and reload.
             self.implementation.reset()
-            vc.setServerBasePath(path: "")
-            DispatchQueue.main.async {
-                vc.loadView()
-                vc.viewDidLoad()
-                print("\(self.implementation.TAG) Reset to builtin version")
-            }
-            return true
+            return self._reload()
         }
+
         return false
     }
 
     @objc func reset(_ call: CAPPluginCall) {
         let toLastSuccessful = call.getBool("toLastSuccessful") ?? false
         if self._reset(toLastSuccessful: toLastSuccessful) {
-            return call.resolve()
+            call.resolve()
+        } else {
+            print("\(self.implementation.TAG) Reset failed")
+            call.reject("\(self.implementation.TAG) Reset failed")
         }
-        print("\(self.implementation.TAG) Reset failed")
-        call.reject("\(self.implementation.TAG) Reset failed")
     }
 
     @objc func current(_ call: CAPPluginCall) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.17.27",
+  "version": "4.17.31",
   "packageManager": "pnpm@7.26.3",
   "license": "LGPL-3.0-only",
   "description": "Live update for capacitor apps",
@@ -68,7 +68,7 @@
     "eslint-plugin-import": "^2.27.5",
     "prettier": "^2.8.3",
     "prettier-plugin-java": "^2.0.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.0.0",
     "rollup": "^3.13.0",
     "swiftlint": "^1.0.1",
     "typescript": "^4.9.5"