@capgo/capacitor-updater 7.19.1 → 7.19.3

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

@@ -65,7 +65,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String channelUrlDefault = "https://plugin.capgo.app/channel_self";
     private static final String CUSTOM_ID_PREF_KEY = "CapacitorUpdater.customId";
 
-    private final String PLUGIN_VERSION = "7.19.1";
+    private final String PLUGIN_VERSION = "7.19.3";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -185,13 +185,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             }
             this.currentVersionNative = new Version(this.getConfig().getString("version", pInfo.versionName));
             this.currentBuildVersion = Integer.toString(pInfo.versionCode);
-            this.delayUpdateUtils = new DelayUpdateUtils(
-                this.prefs,
-                this.editor,
-                this.currentVersionNative,
-                CapacitorUpdaterPlugin.this::installNext,
-                logger
-            );
+            this.delayUpdateUtils = new DelayUpdateUtils(this.prefs, this.editor, this.currentVersionNative, logger);
         } catch (final PackageManager.NameNotFoundException e) {
             logger.error("Error instantiating implementation " + e.getMessage());
             return;

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

@@ -19,19 +19,11 @@ public class DelayUpdateUtils {
     private final SharedPreferences prefs;
     private final SharedPreferences.Editor editor;
     private final Version currentVersionNative;
-    private final Runnable installNext;
 
-    public DelayUpdateUtils(
-        SharedPreferences prefs,
-        SharedPreferences.Editor editor,
-        Version currentVersionNative,
-        Runnable installNext,
-        Logger logger
-    ) {
+    public DelayUpdateUtils(SharedPreferences prefs, SharedPreferences.Editor editor, Version currentVersionNative, Logger logger) {
         this.prefs = prefs;
         this.editor = editor;
         this.currentVersionNative = currentVersionNative;
-        this.installNext = installNext;
         this.logger = logger;
     }
 
@@ -96,7 +88,7 @@ public class DelayUpdateUtils {
                     break;
                 case DelayUntilNext.kill:
                     if (source == CancelDelaySource.KILLED) {
-                        this.installNext.run();
+                        logger.info("Kill delay (value: " + value + ") condition removed at index " + index + " after app kill");
                     } else {
                         delayConditionListToKeep.add(condition);
                         logger.info(
@@ -160,7 +152,9 @@ public class DelayUpdateUtils {
             index++;
         }
 
-        if (!delayConditionListToKeep.isEmpty()) {
+        if (delayConditionListToKeep.isEmpty()) {
+            this.cancelDelay("checkCancelDelay");
+        } else {
             this.setMultiDelay(convertDelayConditionsToJson(delayConditionListToKeep));
         }
     }

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -51,14 +51,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let PLUGIN_VERSION: String = "7.19.1"
+    private let PLUGIN_VERSION: String = "7.19.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"
     private let customIdDefaultsKey = "CapacitorUpdater.customId"
     // Note: DELAY_CONDITION_PREFERENCES is now defined in DelayUpdateUtils.DELAY_CONDITION_PREFERENCES
     private var updateUrl = ""
-    private var statsUrl = ""
     private var backgroundTaskID: UIBackgroundTaskIdentifier = UIBackgroundTaskIdentifier.invalid
     private var currentVersionNative: Version = "0.0.0"
     private var currentBuildVersion: String = "0"
@@ -173,9 +172,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CryptoCipher.setLogger(logger)
 
         // Initialize DelayUpdateUtils
-        self.delayUpdateUtils = DelayUpdateUtils(currentVersionNative: currentVersionNative, installNext: { [weak self] in
-            self?.installNext()
-        }, logger: logger)
+        self.delayUpdateUtils = DelayUpdateUtils(currentVersionNative: currentVersionNative, logger: logger)
         let config = (self.bridge?.viewController as? CAPBridgeViewController)?.instanceDescriptor().legacyConfig
         implementation.appId = Bundle.main.infoDictionary?["CFBundleIdentifier"] as? String ?? ""
         implementation.appId = config?["appId"] as? String ?? implementation.appId
@@ -317,7 +314,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             call.reject("setStatsUrl called without url")
             return
         }
-        self.statsUrl = url
+        self.implementation.statsUrl = url
         call.resolve()
     }
 

package/ios/Sources/CapacitorUpdaterPlugin/DelayUpdateUtils.swift

@@ -22,7 +22,6 @@ public class DelayUpdateUtils {
     private let logger: Logger
 
     private let currentVersionNative: Version
-    private let installNext: () -> Void
 
     public enum CancelDelaySource {
         case killed
@@ -38,9 +37,8 @@ public class DelayUpdateUtils {
         }
     }
 
-    public init(currentVersionNative: Version, installNext: @escaping () -> Void, logger: Logger) {
+    public init(currentVersionNative: Version, logger: Logger) {
         self.currentVersionNative = currentVersionNative
-        self.installNext = installNext
         self.logger = logger
     }
 
@@ -84,7 +82,7 @@ public class DelayUpdateUtils {
 
             case "kill":
                 if source == .killed {
-                    self.installNext()
+                    logger.info("Kill delay (value: \(value ?? "")) condition removed at index \(index) after app kill")
                 } else {
                     delayConditionListToKeep.append(condition)
                     logger.info("Kill delay (value: \(value ?? "")) condition kept at index \(index) (source: \(source.description))")

package/package.json

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