@capgo/capacitor-updater 7.2.14 → 7.2.18

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

@@ -322,6 +322,14 @@ public class CapacitorUpdater {
 
             if (!isManifest) {
                 String checksumDecrypted = Objects.requireNonNullElse(checksumRes, "");
+
+                // If public key is present but no checksum provided, refuse installation
+                if (!this.publicKey.isEmpty() && checksumDecrypted.isEmpty()) {
+                    Log.e(CapacitorUpdater.TAG, "Public key present but no checksum provided");
+                    this.sendStats("checksum_required");
+                    throw new IOException("Checksum required when public key is present: " + id);
+                }
+
                 if (!sessionKey.isEmpty()) {
                     CryptoCipherV2.decryptFile(downloaded, publicKey, sessionKey);
                     checksumDecrypted = CryptoCipherV2.decryptChecksum(checksumRes, publicKey);

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

@@ -49,6 +49,7 @@ import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
 import org.json.JSONArray;
 import org.json.JSONException;
+import org.json.JSONObject;
 
 @CapacitorPlugin(name = "CapacitorUpdater")
 public class CapacitorUpdaterPlugin extends Plugin {
@@ -57,7 +58,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String statsUrlDefault = "https://plugin.capgo.app/stats";
     private static final String channelUrlDefault = "https://plugin.capgo.app/channel_self";
 
-    private final String PLUGIN_VERSION = "7.2.14";
+    private final String PLUGIN_VERSION = "7.2.18";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -86,6 +87,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
     private int lastNotifiedStatPercent = 0;
 
+    private DelayUpdateUtils delayUpdateUtils;
+
     public Thread startNewThread(final Runnable function, Number waitTime) {
         Thread bgTask = new Thread(() -> {
             try {
@@ -140,9 +143,14 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 .readTimeout(this.implementation.timeout, TimeUnit.MILLISECONDS)
                 .writeTimeout(this.implementation.timeout, TimeUnit.MILLISECONDS)
                 .build();
-
             this.implementation.directUpdate = this.getConfig().getBoolean("directUpdate", false);
             this.currentVersionNative = new Version(this.getConfig().getString("version", pInfo.versionName));
+            this.delayUpdateUtils = new DelayUpdateUtils(
+                this.prefs,
+                this.editor,
+                this.currentVersionNative,
+                CapacitorUpdaterPlugin.this::installNext
+            );
         } catch (final PackageManager.NameNotFoundException e) {
             Log.e(CapacitorUpdater.TAG, "Error instantiating implementation", e);
             return;
@@ -831,13 +839,21 @@ public class CapacitorUpdaterPlugin extends Plugin {
     @PluginMethod
     public void setMultiDelay(final PluginCall call) {
         try {
-            final Object delayConditions = call.getData().opt("delayConditions");
+            final JSONArray delayConditions = call.getData().optJSONArray("delayConditions");
             if (delayConditions == null) {
                 Log.e(CapacitorUpdater.TAG, "setMultiDelay called without delayCondition");
                 call.reject("setMultiDelay called without delayCondition");
                 return;
             }
-            if (_setMultiDelay(delayConditions.toString())) {
+            for (int i = 0; i < delayConditions.length(); i++) {
+                final JSONObject object = delayConditions.optJSONObject(i);
+                if (object != null && object.optString("kind").equals("background") && object.optString("value").isEmpty()) {
+                    object.put("value", "0");
+                    delayConditions.put(i, object);
+                }
+            }
+
+            if (this.delayUpdateUtils.setMultiDelay(delayConditions.toString())) {
                 call.resolve();
             } else {
                 call.reject("Failed to delay update");
@@ -848,95 +864,15 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
     }
 
-    private Boolean _setMultiDelay(String delayConditions) {
-        try {
-            this.editor.putString(DELAY_CONDITION_PREFERENCES, delayConditions);
-            this.editor.commit();
-            Log.i(CapacitorUpdater.TAG, "Delay update saved");
-            return true;
-        } catch (final Exception e) {
-            Log.e(CapacitorUpdater.TAG, "Failed to delay update, [Error calling '_setMultiDelay()']", e);
-            return false;
-        }
-    }
-
-    private boolean _cancelDelay(String source) {
-        try {
-            this.editor.remove(DELAY_CONDITION_PREFERENCES);
-            this.editor.commit();
-            Log.i(CapacitorUpdater.TAG, "All delays canceled from " + source);
-            return true;
-        } catch (final Exception e) {
-            Log.e(CapacitorUpdater.TAG, "Failed to cancel update delay", e);
-            return false;
-        }
-    }
-
     @PluginMethod
     public void cancelDelay(final PluginCall call) {
-        if (this._cancelDelay("JS")) {
+        if (this.delayUpdateUtils.cancelDelay("JS")) {
             call.resolve();
         } else {
             call.reject("Failed to cancel delay");
         }
     }
 
-    private void _checkCancelDelay(Boolean killed) {
-        Gson gson = new Gson();
-        String delayUpdatePreferences = prefs.getString(DELAY_CONDITION_PREFERENCES, "[]");
-        Type type = new TypeToken<ArrayList<DelayCondition>>() {}.getType();
-        ArrayList<DelayCondition> delayConditionList = gson.fromJson(delayUpdatePreferences, type);
-        for (DelayCondition condition : delayConditionList) {
-            String kind = condition.getKind().toString();
-            String value = condition.getValue();
-            if (!kind.isEmpty()) {
-                switch (kind) {
-                    case "background":
-                        if (!killed) {
-                            this._cancelDelay("background check");
-                        }
-                        break;
-                    case "kill":
-                        if (killed) {
-                            this._cancelDelay("kill check");
-                            this.installNext();
-                        }
-                        break;
-                    case "date":
-                        if (!"".equals(value)) {
-                            try {
-                                final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
-                                Date date = sdf.parse(value);
-                                assert date != null;
-                                if (new Date().compareTo(date) > 0) {
-                                    this._cancelDelay("date expired");
-                                }
-                            } catch (final Exception e) {
-                                this._cancelDelay("date parsing issue");
-                            }
-                        } else {
-                            this._cancelDelay("delayVal absent");
-                        }
-                        break;
-                    case "nativeVersion":
-                        if (!"".equals(value)) {
-                            try {
-                                final Version versionLimit = new Version(value);
-                                if (this.currentVersionNative.isAtLeast(versionLimit)) {
-                                    this._cancelDelay("nativeVersion above limit");
-                                }
-                            } catch (final Exception e) {
-                                this._cancelDelay("nativeVersion parsing issue");
-                            }
-                        } else {
-                            this._cancelDelay("delayVal absent");
-                        }
-                        break;
-                }
-            }
-        }
-    }
-
     private Boolean _isAutoUpdateEnabled() {
         final CapConfig config = CapConfig.loadDefault(this.getActivity());
         String serverUrl = config.getServerUrl();
@@ -1107,7 +1043,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                     );
                                     if (CapacitorUpdaterPlugin.this.implementation.directUpdate) {
                                         Gson gson = new Gson();
-                                        String delayUpdatePreferences = prefs.getString(DELAY_CONDITION_PREFERENCES, "[]");
+                                        String delayUpdatePreferences = prefs.getString(DelayUpdateUtils.DELAY_CONDITION_PREFERENCES, "[]");
                                         Type type = new TypeToken<ArrayList<DelayCondition>>() {}.getType();
                                         ArrayList<DelayCondition> delayConditionList = gson.fromJson(delayUpdatePreferences, type);
                                         if (delayConditionList != null && !delayConditionList.isEmpty()) {
@@ -1221,7 +1157,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private void installNext() {
         try {
             Gson gson = new Gson();
-            String delayUpdatePreferences = prefs.getString(DELAY_CONDITION_PREFERENCES, "[]");
+            String delayUpdatePreferences = prefs.getString(DelayUpdateUtils.DELAY_CONDITION_PREFERENCES, "[]");
             Type type = new TypeToken<ArrayList<DelayCondition>>() {}.getType();
             ArrayList<DelayCondition> delayConditionList = gson.fromJson(delayUpdatePreferences, type);
             if (delayConditionList != null && !delayConditionList.isEmpty()) {
@@ -1302,7 +1238,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
     public void appMovedToForeground() {
         final BundleInfo current = CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
         CapacitorUpdaterPlugin.this.implementation.sendStats("app_moved_to_foreground", current.getVersionName());
-        this._checkCancelDelay(false);
+        this.delayUpdateUtils.checkCancelDelay(DelayUpdateUtils.CancelDelaySource.FOREGROUND);
+        this.delayUpdateUtils.unsetBackgroundTimestamp();
         if (
             CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() &&
             (this.backgroundDownloadTask == null || !this.backgroundDownloadTask.isAlive())
@@ -1320,35 +1257,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
         CapacitorUpdaterPlugin.this.implementation.sendStats("app_moved_to_background", current.getVersionName());
         Log.i(CapacitorUpdater.TAG, "Checking for pending update");
         try {
-            Gson gson = new Gson();
-            String delayUpdatePreferences = prefs.getString(DELAY_CONDITION_PREFERENCES, "[]");
-            Type type = new TypeToken<ArrayList<DelayCondition>>() {}.getType();
-            ArrayList<DelayCondition> delayConditionList = gson.fromJson(delayUpdatePreferences, type);
-            String backgroundValue = null;
-            for (DelayCondition delayCondition : delayConditionList) {
-                if (delayCondition.getKind().toString().equals("background")) {
-                    String value = delayCondition.getValue();
-                    backgroundValue = (value != null && !value.isEmpty()) ? value : "0";
-                }
-            }
-            if (backgroundValue != null) {
-                taskRunning = true;
-                final Long timeout = Long.parseLong(backgroundValue);
-                if (backgroundTask != null) {
-                    backgroundTask.interrupt();
-                }
-                backgroundTask = startNewThread(
-                    () -> {
-                        taskRunning = false;
-                        _checkCancelDelay(false);
-                        installNext();
-                    },
-                    timeout
-                );
-            } else {
-                this._checkCancelDelay(false);
-                this.installNext();
-            }
+            // We need to set "backgrounded time"
+            this.delayUpdateUtils.setBackgroundTimestamp(System.currentTimeMillis());
+            this.delayUpdateUtils.checkCancelDelay(DelayUpdateUtils.CancelDelaySource.BACKGROUND);
+            this.installNext();
         } catch (final Exception e) {
             Log.e(CapacitorUpdater.TAG, "Error during onActivityStopped", e);
         }
@@ -1379,7 +1291,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
     private void appKilled() {
         Log.d(CapacitorUpdater.TAG, "onActivityDestroyed: all activity destroyed");
-        this._checkCancelDelay(true);
+        this.delayUpdateUtils.checkCancelDelay(DelayUpdateUtils.CancelDelaySource.KILLED);
     }
 
     @Override

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

@@ -0,0 +1,222 @@
+package ee.forgr.capacitor_updater;
+
+import android.content.SharedPreferences;
+import android.util.Log;
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import io.github.g00fy2.versioncompare.Version;
+import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+
+public class DelayUpdateUtils {
+
+    public static final String DELAY_CONDITION_PREFERENCES = "DELAY_CONDITION_PREFERENCES_CAPGO";
+    public static final String BACKGROUND_TIMESTAMP_KEY = "BACKGROUND_TIMESTAMP_KEY_CAPGO";
+
+    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) {
+        this.prefs = prefs;
+        this.editor = editor;
+        this.currentVersionNative = currentVersionNative;
+        this.installNext = installNext;
+    }
+
+    public enum CancelDelaySource {
+        KILLED,
+        BACKGROUND,
+        FOREGROUND
+    }
+
+    public void checkCancelDelay(CancelDelaySource source) {
+        Gson gson = new Gson();
+        String delayUpdatePreferences = prefs.getString(DELAY_CONDITION_PREFERENCES, "[]");
+        Type type = new TypeToken<ArrayList<DelayCondition>>() {}.getType();
+        ArrayList<DelayCondition> delayConditionList = gson.fromJson(delayUpdatePreferences, type);
+        ArrayList<DelayCondition> delayConditionListToKeep = new ArrayList<>(delayConditionList.size());
+        int index = 0;
+
+        for (DelayCondition condition : delayConditionList) {
+            DelayUntilNext kind = condition.getKind();
+            String value = condition.getValue();
+            switch (kind) {
+                case DelayUntilNext.background:
+                    if (source == CancelDelaySource.FOREGROUND) {
+                        long backgroundedAt = getBackgroundTimestamp();
+                        long now = System.currentTimeMillis();
+                        long delta = Math.max(0, now - backgroundedAt);
+                        long longValue = 0L;
+                        try {
+                            longValue = Long.parseLong(value);
+                        } catch (NumberFormatException e) {
+                            Log.e(
+                                CapacitorUpdater.TAG,
+                                "Background condition (value: " +
+                                value +
+                                ") had an invalid value at index " +
+                                index +
+                                ". We will likely remove it."
+                            );
+                        }
+
+                        if (delta > longValue) {
+                            Log.i(
+                                CapacitorUpdater.TAG,
+                                "Background condition (value: " +
+                                value +
+                                ") deleted at index " +
+                                index +
+                                ". Delta: " +
+                                delta +
+                                ", longValue: " +
+                                longValue
+                            );
+                        }
+                    } else {
+                        delayConditionListToKeep.add(condition);
+                        Log.i(
+                            CapacitorUpdater.TAG,
+                            "Background delay (value: " +
+                            value +
+                            ") condition kept at index " +
+                            index +
+                            " (source: " +
+                            source.toString() +
+                            ")"
+                        );
+                    }
+                    break;
+                case DelayUntilNext.kill:
+                    if (source == CancelDelaySource.KILLED) {
+                        this.installNext.run();
+                    } else {
+                        delayConditionListToKeep.add(condition);
+                        Log.i(
+                            CapacitorUpdater.TAG,
+                            "Kill delay (value: " + value + ") condition kept at index " + index + " (source: " + source.toString() + ")"
+                        );
+                    }
+                    break;
+                case DelayUntilNext.date:
+                    if (!"".equals(value)) {
+                        try {
+                            final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+                            Date date = sdf.parse(value);
+                            assert date != null;
+                            if (new Date().compareTo(date) > 0) {
+                                Log.i(
+                                    CapacitorUpdater.TAG,
+                                    "Date delay (value: " + value + ") condition removed due to expired date at index " + index
+                                );
+                            } else {
+                                delayConditionListToKeep.add(condition);
+                                Log.i(CapacitorUpdater.TAG, "Date delay (value: " + value + ") condition kept at index " + index);
+                            }
+                        } catch (final Exception e) {
+                            Log.e(
+                                CapacitorUpdater.TAG,
+                                "Date delay (value: " + value + ") condition removed due to parsing issue at index " + index,
+                                e
+                            );
+                        }
+                    } else {
+                        Log.d(
+                            CapacitorUpdater.TAG,
+                            "Date delay (value: " + value + ") condition removed due to empty value at index " + index
+                        );
+                    }
+                    break;
+                case DelayUntilNext.nativeVersion:
+                    if (!"".equals(value)) {
+                        try {
+                            final Version versionLimit = new Version(value);
+                            if (this.currentVersionNative.isAtLeast(versionLimit)) {
+                                Log.i(
+                                    CapacitorUpdater.TAG,
+                                    "Native version delay (value: " + value + ") condition removed due to above limit at index " + index
+                                );
+                            } else {
+                                delayConditionListToKeep.add(condition);
+                                Log.i(CapacitorUpdater.TAG, "Native version delay (value: " + value + ") condition kept at index " + index);
+                            }
+                        } catch (final Exception e) {
+                            Log.e(
+                                CapacitorUpdater.TAG,
+                                "Native version delay (value: " + value + ") condition removed due to parsing issue at index " + index,
+                                e
+                            );
+                        }
+                    } else {
+                        Log.d(
+                            CapacitorUpdater.TAG,
+                            "Native version delay (value: " + value + ") condition removed due to empty value at index " + index
+                        );
+                    }
+                    break;
+            }
+            index++;
+        }
+
+        if (!delayConditionListToKeep.isEmpty()) {
+            this.setMultiDelay(gson.toJson(delayConditionListToKeep));
+        }
+    }
+
+    public Boolean setMultiDelay(String delayConditions) {
+        try {
+            this.editor.putString(DELAY_CONDITION_PREFERENCES, delayConditions);
+            this.editor.commit();
+            Log.i(CapacitorUpdater.TAG, "Delay update saved");
+            return true;
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to delay update, [Error calling '_setMultiDelay()']", e);
+            return false;
+        }
+    }
+
+    public void setBackgroundTimestamp(long backgroundTimestamp) {
+        try {
+            this.editor.putLong(BACKGROUND_TIMESTAMP_KEY, backgroundTimestamp);
+            this.editor.commit();
+            Log.i(CapacitorUpdater.TAG, "Delay update saved");
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to delay update, [Error calling '_setBackgroundTimestamp()']", e);
+        }
+    }
+
+    public void unsetBackgroundTimestamp() {
+        try {
+            this.editor.remove(BACKGROUND_TIMESTAMP_KEY);
+            this.editor.commit();
+            Log.i(CapacitorUpdater.TAG, "Delay update saved");
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to delay update, [Error calling '_unsetBackgroundTimestamp()']", e);
+        }
+    }
+
+    private long getBackgroundTimestamp() {
+        try {
+            return this.prefs.getLong(BACKGROUND_TIMESTAMP_KEY, 0);
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to delay update, [Error calling '_getBackgroundTimestamp()']", e);
+            return 0;
+        }
+    }
+
+    public boolean cancelDelay(String source) {
+        try {
+            this.editor.remove(DELAY_CONDITION_PREFERENCES);
+            this.editor.commit();
+            Log.i(CapacitorUpdater.TAG, "All delays canceled from " + source);
+            return true;
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to cancel update delay", e);
+            return false;
+        }
+    }
+}

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -45,11 +45,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "getNextBundle", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "7.2.14"
+    private let PLUGIN_VERSION: String = "7.2.18"
     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"
-    let DELAY_CONDITION_PREFERENCES = ""
+    // Note: DELAY_CONDITION_PREFERENCES is now defined in DelayUpdateUtils.DELAY_CONDITION_PREFERENCES
     private var updateUrl = ""
     private var statsUrl = ""
     private var backgroundTaskID: UIBackgroundTaskIdentifier = UIBackgroundTaskIdentifier.invalid
@@ -67,6 +67,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     private var periodCheckDelay = 0
     let semaphoreReady = DispatchSemaphore(value: 0)
 
+    private var delayUpdateUtils: DelayUpdateUtils!
+
     override public func load() {
         #if targetEnvironment(simulator)
         print("\(CapacitorUpdater.TAG) ::::: SIMULATOR :::::")
@@ -109,6 +111,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         implementation.publicKey = getConfig().getString("publicKey", "")!
         implementation.notifyDownloadRaw = notifyDownload
         implementation.PLUGIN_VERSION = self.PLUGIN_VERSION
+
+        // Initialize DelayUpdateUtils
+        self.delayUpdateUtils = DelayUpdateUtils(currentVersionNative: currentVersionNative, installNext: { [weak self] in
+            self?.installNext()
+        })
         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
@@ -291,6 +298,18 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         DispatchQueue.global(qos: .background).async {
             do {
                 let next = try self.implementation.download(url: url!, version: version, sessionKey: sessionKey)
+                // If public key is present but no checksum provided, refuse installation
+                if self.implementation.publicKey != "" && checksum == "" {
+                    print("\(CapacitorUpdater.TAG) Public key present but no checksum provided")
+                    self.implementation.sendStats(action: "checksum_required", versionName: next.getVersionName())
+                    let id = next.getId()
+                    let resDel = self.implementation.delete(id: id)
+                    if !resDel {
+                        print("\(CapacitorUpdater.TAG) Delete failed, id \(id) doesn't exist")
+                    }
+                    throw ObjectSavableError.checksum
+                }
+
                 checksum = try CryptoCipherV2.decryptChecksum(checksum: checksum, publicKey: self.implementation.publicKey)
                 if (checksum != "" || self.implementation.publicKey != "") && next.getChecksum() != checksum {
                     print("\(CapacitorUpdater.TAG) Error checksum", next.getChecksum(), checksum)
@@ -549,96 +568,45 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             call.reject("setMultiDelay called without delayCondition")
             return
         }
-        let delayConditions: String = toJson(object: delayConditionList)
-        if _setMultiDelay(delayConditions: delayConditions) {
-            call.resolve()
-        } else {
-            call.reject("Failed to delay update")
-        }
-    }
 
-    private func _setMultiDelay(delayConditions: String?) -> Bool {
-        if delayConditions != nil && "" != delayConditions {
-            UserDefaults.standard.set(delayConditions, forKey: DELAY_CONDITION_PREFERENCES)
-            UserDefaults.standard.synchronize()
-            print("\(CapacitorUpdater.TAG) Delay update saved.")
-            return true
+        // Handle background conditions with empty value (set to "0")
+        if var modifiableList = delayConditionList as? [[String: Any]] {
+            for i in 0..<modifiableList.count {
+                if let kind = modifiableList[i]["kind"] as? String,
+                   kind == "background",
+                   let value = modifiableList[i]["value"] as? String,
+                   value.isEmpty {
+                    modifiableList[i]["value"] = "0"
+                }
+            }
+            let delayConditions: String = toJson(object: modifiableList)
+            if delayUpdateUtils.setMultiDelay(delayConditions: delayConditions) {
+                call.resolve()
+            } else {
+                call.reject("Failed to delay update")
+            }
         } else {
-            print("\(CapacitorUpdater.TAG) Failed to delay update, [Error calling '_setMultiDelay()']")
-            return false
+            let delayConditions: String = toJson(object: delayConditionList)
+            if delayUpdateUtils.setMultiDelay(delayConditions: delayConditions) {
+                call.resolve()
+            } else {
+                call.reject("Failed to delay update")
+            }
         }
     }
 
-    private func _cancelDelay(source: String) {
-        print("\(CapacitorUpdater.TAG) delay Canceled from \(source)")
-        UserDefaults.standard.removeObject(forKey: DELAY_CONDITION_PREFERENCES)
-        UserDefaults.standard.synchronize()
-    }
+    // Note: _setMultiDelay and _cancelDelay methods have been moved to DelayUpdateUtils class
 
     @objc func cancelDelay(_ call: CAPPluginCall) {
-        self._cancelDelay(source: "JS")
-        call.resolve()
-    }
-
-    private func _checkCancelDelay(killed: Bool) {
-        let delayUpdatePreferences = UserDefaults.standard.string(forKey: DELAY_CONDITION_PREFERENCES) ?? "[]"
-        let delayConditionList: [DelayCondition] = fromJsonArr(json: delayUpdatePreferences).map { obj -> DelayCondition in
-            let kind: String = obj.value(forKey: "kind") as! String
-            let value: String? = obj.value(forKey: "value") as? String
-            return DelayCondition(kind: kind, value: value)
-        }
-        for condition in delayConditionList {
-            let kind: String? = condition.getKind()
-            let value: String? = condition.getValue()
-            if kind != nil {
-                switch kind {
-                case "background":
-                    if !killed {
-                        self._cancelDelay(source: "background check")
-                    }
-                case "kill":
-                    if killed {
-                        self._cancelDelay(source: "kill check")
-                        // instant install for kill action
-                        self.installNext()
-                    }
-                case "date":
-                    if value != nil && value != "" {
-                        let dateFormatter = ISO8601DateFormatter()
-                        dateFormatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
-                        guard let ExpireDate = dateFormatter.date(from: value!) else {
-                            self._cancelDelay(source: "date parsing issue")
-                            return
-                        }
-                        if ExpireDate < Date() {
-                            self._cancelDelay(source: "date expired")
-                        }
-                    } else {
-                        self._cancelDelay(source: "delayVal absent")
-                    }
-                case "nativeVersion":
-                    if value != nil && value != "" {
-                        do {
-                            let versionLimit = try Version(value!)
-                            if self.currentVersionNative >= versionLimit {
-                                self._cancelDelay(source: "nativeVersion above limit")
-                            }
-                        } catch {
-                            self._cancelDelay(source: "nativeVersion parsing issue")
-                        }
-                    } else {
-                        self._cancelDelay(source: "delayVal absent")
-                    }
-                case .none:
-                    print("\(CapacitorUpdater.TAG) _checkCancelDelay switch case none error")
-                case .some:
-                    print("\(CapacitorUpdater.TAG) _checkCancelDelay switch case some error")
-                }
-            }
+        if delayUpdateUtils.cancelDelay(source: "JS") {
+            call.resolve()
+        } else {
+            call.reject("Failed to cancel delay")
         }
-        // self.checkAppReady() why this here?
     }
 
+    // Note: _checkCancelDelay method has been moved to DelayUpdateUtils class
+
     private func _isAutoUpdateEnabled() -> Bool {
         let instanceDescriptor = (self.bridge?.viewController as? CAPBridgeViewController)?.instanceDescriptor()
         if instanceDescriptor?.serverURL != nil {
@@ -818,10 +786,20 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                         return
                     }
                     if self.directUpdate {
+                        let delayUpdatePreferences = UserDefaults.standard.string(forKey: DelayUpdateUtils.DELAY_CONDITION_PREFERENCES) ?? "[]"
+                        let delayConditionList: [DelayCondition] = self.fromJsonArr(json: delayUpdatePreferences).map { obj -> DelayCondition in
+                            let kind: String = obj.value(forKey: "kind") as! String
+                            let value: String? = obj.value(forKey: "value") as? String
+                            return DelayCondition(kind: kind, value: value)
+                        }
+                        if !delayConditionList.isEmpty {
+                            print("\(CapacitorUpdater.TAG) Update delayed until delay conditions met")
+                            self.endBackGroundTaskWithNotif(msg: "Update delayed until delay conditions met", latestVersionName: latestVersionName, current: next, error: false)
+                            return
+                        }
                         _ = self.implementation.set(bundle: next)
                         _ = self._reload()
-                        self.directUpdate = false
-                        self.endBackGroundTaskWithNotif(msg: "update installed", latestVersionName: latestVersionName, current: current, error: false)
+                        self.endBackGroundTaskWithNotif(msg: "update installed", latestVersionName: latestVersionName, current: next, error: false)
                     } else {
                         self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
                         _ = self.implementation.setNextBundle(next: next.getId())
@@ -844,17 +822,17 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func appKilled() {
         print("\(CapacitorUpdater.TAG) onActivityDestroyed: all activity destroyed")
-        self._checkCancelDelay(killed: true)
+        self.delayUpdateUtils.checkCancelDelay(source: .killed)
     }
 
     private func installNext() {
-        let delayUpdatePreferences = UserDefaults.standard.string(forKey: DELAY_CONDITION_PREFERENCES) ?? "[]"
-        let delayConditionList: [DelayCondition]? = fromJsonArr(json: delayUpdatePreferences).map { obj -> DelayCondition in
+        let delayUpdatePreferences = UserDefaults.standard.string(forKey: DelayUpdateUtils.DELAY_CONDITION_PREFERENCES) ?? "[]"
+        let delayConditionList: [DelayCondition] = fromJsonArr(json: delayUpdatePreferences).map { obj -> DelayCondition in
             let kind: String = obj.value(forKey: "kind") as! String
             let value: String? = obj.value(forKey: "value") as? String
             return DelayCondition(kind: kind, value: value)
         }
-        if delayConditionList != nil && delayConditionList?.capacity != 0 {
+        if !delayConditionList.isEmpty {
             print("\(CapacitorUpdater.TAG) Update delayed until delay conditions met")
             return
         }
@@ -893,6 +871,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     @objc func appMovedToForeground() {
         let current: BundleInfo = self.implementation.getCurrentBundle()
         self.implementation.sendStats(action: "app_moved_to_foreground", versionName: current.getVersionName())
+        self.delayUpdateUtils.checkCancelDelay(source: .foreground)
+        self.delayUpdateUtils.unsetBackgroundTimestamp()
         if backgroundWork != nil && taskRunning {
             backgroundWork!.cancel()
             print("\(CapacitorUpdater.TAG) Background Timer Task canceled, Activity resumed before timer completes")
@@ -929,38 +909,15 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     @objc func appMovedToBackground() {
-        self.implementation.sendStats(action: "app_moved_to_background")
+        let current: BundleInfo = self.implementation.getCurrentBundle()
+        self.implementation.sendStats(action: "app_moved_to_background", versionName: current.getVersionName())
         print("\(CapacitorUpdater.TAG) Check for pending update")
-        let delayUpdatePreferences = UserDefaults.standard.string(forKey: DELAY_CONDITION_PREFERENCES) ?? "[]"
-
-        let delayConditionList: [DelayCondition] = fromJsonArr(json: delayUpdatePreferences).map { obj -> DelayCondition in
-            let kind: String = obj.value(forKey: "kind") as! String
-            let value: String? = obj.value(forKey: "value") as? String
-            return DelayCondition(kind: kind, value: value)
-        }
-        var backgroundValue: String?
-        for delayCondition in delayConditionList {
-            if delayCondition.getKind() == "background" {
-                let value: String? = delayCondition.getValue()
-                backgroundValue = (value != nil && value != "") ? value! : "0"
-            }
-        }
-        if backgroundValue != nil {
-            self.taskRunning = true
-            let interval: Double = (Double(backgroundValue!) ?? 0.0) / 1000
-            self.backgroundWork?.cancel()
-            self.backgroundWork = DispatchWorkItem(block: {
-                // IOS never executes this task in background
-                self.taskRunning = false
-                self._checkCancelDelay(killed: false)
-                self.installNext()
-            })
-            DispatchQueue.global(qos: .background).asyncAfter(deadline: .now() + interval, execute: self.backgroundWork!)
-        } else {
-            self._checkCancelDelay(killed: false)
-            self.installNext()
-        }
 
+        // Set background timestamp
+        let backgroundTimestamp = Int64(Date().timeIntervalSince1970 * 1000) // Convert to milliseconds
+        self.delayUpdateUtils.setBackgroundTimestamp(backgroundTimestamp)
+        self.delayUpdateUtils.checkCancelDelay(source: .background)
+        self.installNext()
     }
 
     @objc func getNextBundle(_ call: CAPPluginCall) {

package/ios/Plugin/DelayUpdateUtils.swift

@@ -0,0 +1,220 @@
+/*
+ * 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/.
+ */
+
+//
+//  DelayUpdateUtils.swift
+//  Plugin
+//
+//  Created by Auto-generated based on Android implementation
+//  Copyright © 2024 Capgo. All rights reserved.
+//
+
+import Foundation
+import Version
+
+public class DelayUpdateUtils {
+
+    static let DELAY_CONDITION_PREFERENCES = "DELAY_CONDITION_PREFERENCES_CAPGO"
+    static let BACKGROUND_TIMESTAMP_KEY = "BACKGROUND_TIMESTAMP_KEY_CAPGO"
+
+    private let currentVersionNative: Version
+    private let installNext: () -> Void
+
+    public enum CancelDelaySource {
+        case killed
+        case background
+        case foreground
+
+        var description: String {
+            switch self {
+            case .killed: return "KILLED"
+            case .background: return "BACKGROUND"
+            case .foreground: return "FOREGROUND"
+            }
+        }
+    }
+
+    public init(currentVersionNative: Version, installNext: @escaping () -> Void) {
+        self.currentVersionNative = currentVersionNative
+        self.installNext = installNext
+    }
+
+    public func checkCancelDelay(source: CancelDelaySource) {
+        let delayUpdatePreferences = UserDefaults.standard.string(forKey: DelayUpdateUtils.DELAY_CONDITION_PREFERENCES) ?? "[]"
+        let delayConditionList: [DelayCondition] = fromJsonArr(json: delayUpdatePreferences).map { obj -> DelayCondition in
+            let kind: String = obj.value(forKey: "kind") as! String
+            let value: String? = obj.value(forKey: "value") as? String
+            return DelayCondition(kind: kind, value: value)
+        }
+
+        var delayConditionListToKeep: [DelayCondition] = []
+        var index = 0
+
+        for condition in delayConditionList {
+            let kind = condition.getKind()
+            let value = condition.getValue()
+
+            switch kind {
+            case "background":
+                if source == .foreground {
+                    let backgroundedAt = getBackgroundTimestamp()
+                    let now = Int64(Date().timeIntervalSince1970 * 1000) // Convert to milliseconds
+                    let delta = max(0, now - backgroundedAt)
+
+                    var longValue: Int64 = 0
+                    if let value = value, !value.isEmpty {
+                        longValue = Int64(value) ?? 0
+                    }
+
+                    if delta > longValue {
+                        print("\(CapacitorUpdater.TAG) Background condition (value: \(value ?? "")) deleted at index \(index). Delta: \(delta), longValue: \(longValue)")
+                    } else {
+                        delayConditionListToKeep.append(condition)
+                        print("\(CapacitorUpdater.TAG) Background delay (value: \(value ?? "")) condition kept at index \(index) (source: \(source.description))")
+                    }
+                } else {
+                    delayConditionListToKeep.append(condition)
+                    print("\(CapacitorUpdater.TAG) Background delay (value: \(value ?? "")) condition kept at index \(index) (source: \(source.description))")
+                }
+
+            case "kill":
+                if source == .killed {
+                    self.installNext()
+                } else {
+                    delayConditionListToKeep.append(condition)
+                    print("\(CapacitorUpdater.TAG) Kill delay (value: \(value ?? "")) condition kept at index \(index) (source: \(source.description))")
+                }
+
+            case "date":
+                if let value = value, !value.isEmpty {
+                    do {
+                        let dateFormatter = ISO8601DateFormatter()
+                        dateFormatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+
+                        if let date = dateFormatter.date(from: value) {
+                            if Date() > date {
+                                print("\(CapacitorUpdater.TAG) Date delay (value: \(value)) condition removed due to expired date at index \(index)")
+                            } else {
+                                delayConditionListToKeep.append(condition)
+                                print("\(CapacitorUpdater.TAG) Date delay (value: \(value)) condition kept at index \(index)")
+                            }
+                        } else {
+                            print("\(CapacitorUpdater.TAG) Date delay (value: \(value)) condition removed due to parsing issue at index \(index)")
+                        }
+                    } catch {
+                        print("\(CapacitorUpdater.TAG) Date delay (value: \(value)) condition removed due to parsing issue at index \(index): \(error)")
+                    }
+                } else {
+                    print("\(CapacitorUpdater.TAG) Date delay (value: \(value ?? "")) condition removed due to empty value at index \(index)")
+                }
+
+            case "nativeVersion":
+                if let value = value, !value.isEmpty {
+                    do {
+                        let versionLimit = try Version(value)
+                        if currentVersionNative >= versionLimit {
+                            print("\(CapacitorUpdater.TAG) Native version delay (value: \(value)) condition removed due to above limit at index \(index)")
+                        } else {
+                            delayConditionListToKeep.append(condition)
+                            print("\(CapacitorUpdater.TAG) Native version delay (value: \(value)) condition kept at index \(index)")
+                        }
+                    } catch {
+                        print("\(CapacitorUpdater.TAG) Native version delay (value: \(value)) condition removed due to parsing issue at index \(index): \(error)")
+                    }
+                } else {
+                    print("\(CapacitorUpdater.TAG) Native version delay (value: \(value ?? "")) condition removed due to empty value at index \(index)")
+                }
+
+            default:
+                print("\(CapacitorUpdater.TAG) Unknown delay condition kind: \(kind) at index \(index)")
+            }
+
+            index += 1
+        }
+
+        if !delayConditionListToKeep.isEmpty {
+            let json = toJson(object: delayConditionListToKeep.map { $0.toJSON() })
+            _ = setMultiDelay(delayConditions: json)
+        } else {
+            // Clear all delay conditions if none are left to keep
+            _ = cancelDelay(source: "checkCancelDelay")
+        }
+    }
+
+    public func setMultiDelay(delayConditions: String) -> Bool {
+        do {
+            UserDefaults.standard.set(delayConditions, forKey: DelayUpdateUtils.DELAY_CONDITION_PREFERENCES)
+            UserDefaults.standard.synchronize()
+            print("\(CapacitorUpdater.TAG) Delay update saved")
+            return true
+        } catch {
+            print("\(CapacitorUpdater.TAG) Failed to delay update, [Error calling 'setMultiDelay()']: \(error)")
+            return false
+        }
+    }
+
+    public func setBackgroundTimestamp(_ backgroundTimestamp: Int64) {
+        do {
+            UserDefaults.standard.set(backgroundTimestamp, forKey: DelayUpdateUtils.BACKGROUND_TIMESTAMP_KEY)
+            UserDefaults.standard.synchronize()
+            print("\(CapacitorUpdater.TAG) Background timestamp saved")
+        } catch {
+            print("\(CapacitorUpdater.TAG) Failed to save background timestamp, [Error calling 'setBackgroundTimestamp()']: \(error)")
+        }
+    }
+
+    public func unsetBackgroundTimestamp() {
+        do {
+            UserDefaults.standard.removeObject(forKey: DelayUpdateUtils.BACKGROUND_TIMESTAMP_KEY)
+            UserDefaults.standard.synchronize()
+            print("\(CapacitorUpdater.TAG) Background timestamp removed")
+        } catch {
+            print("\(CapacitorUpdater.TAG) Failed to remove background timestamp, [Error calling 'unsetBackgroundTimestamp()']: \(error)")
+        }
+    }
+
+    private func getBackgroundTimestamp() -> Int64 {
+        do {
+            let timestamp = UserDefaults.standard.object(forKey: DelayUpdateUtils.BACKGROUND_TIMESTAMP_KEY) as? Int64 ?? 0
+            return timestamp
+        } catch {
+            print("\(CapacitorUpdater.TAG) Failed to get background timestamp, [Error calling 'getBackgroundTimestamp()']: \(error)")
+            return 0
+        }
+    }
+
+    public func cancelDelay(source: String) -> Bool {
+        do {
+            UserDefaults.standard.removeObject(forKey: DelayUpdateUtils.DELAY_CONDITION_PREFERENCES)
+            UserDefaults.standard.synchronize()
+            print("\(CapacitorUpdater.TAG) All delays canceled from \(source)")
+            return true
+        } catch {
+            print("\(CapacitorUpdater.TAG) Failed to cancel update delay: \(error)")
+            return false
+        }
+    }
+
+    // MARK: - Helper methods
+
+    private func toJson(object: Any) -> String {
+        guard let data = try? JSONSerialization.data(withJSONObject: object, options: []) else {
+            return ""
+        }
+        return String(data: data, encoding: String.Encoding.utf8) ?? ""
+    }
+
+    private func fromJsonArr(json: String) -> [NSObject] {
+        guard let jsonData = json.data(using: .utf8) else {
+            return []
+        }
+        let object = try? JSONSerialization.jsonObject(
+            with: jsonData,
+            options: .mutableContainers
+        ) as? [NSObject]
+        return object ?? []
+    }
+}

package/package.json

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