@capgo/capacitor-updater 7.9.0 → 7.9.1

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

@@ -59,7 +59,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.9.0";
+    private final String PLUGIN_VERSION = "7.9.1";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -233,7 +233,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         this.implementation.versionOs = Build.VERSION.RELEASE;
         this.implementation.deviceID = this.prefs.getString("appUUID", UUID.randomUUID().toString()).toLowerCase();
         this.editor.putString("appUUID", this.implementation.deviceID);
-        this.editor.commit();
+        this.editor.apply();
         logger.info("init for device " + this.implementation.deviceID);
         logger.info("version native " + this.currentVersionNative.getOriginalString());
         this.autoDeleteFailed = this.getConfig().getBoolean("autoDeleteFailed", true);
@@ -455,7 +455,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             logger.error("Error calculating previous native version " + e.getMessage());
         }
         this.editor.putString("LatestVersionNative", this.currentVersionNative.toString());
-        this.editor.commit();
+        this.editor.apply();
     }
 
     public void notifyDownload(final String id, final int percent) {

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

@@ -486,14 +486,14 @@ public class DownloadService extends Worker {
 
     private String calculateFileHash(File file) throws Exception {
         MessageDigest digest = MessageDigest.getInstance("SHA-256");
-        FileInputStream fis = new FileInputStream(file);
         byte[] byteArray = new byte[1024];
         int bytesCount = 0;
 
-        while ((bytesCount = fis.read(byteArray)) != -1) {
-            digest.update(byteArray, 0, bytesCount);
+        try (FileInputStream fis = new FileInputStream(file)) {
+            while ((bytesCount = fis.read(byteArray)) != -1) {
+                digest.update(byteArray, 0, bytesCount);
+            }
         }
-        fis.close();
 
         byte[] bytes = digest.digest();
         StringBuilder sb = new StringBuilder();

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

@@ -23,6 +23,7 @@ public class DownloadWorkerManager {
 
     private static volatile boolean isInitialized = false;
     private static final Set<String> activeVersions = new HashSet<>();
+    private static final Object activeVersionsLock = new Object();
 
     private static synchronized void initializeIfNeeded(Context context) {
         if (!isInitialized) {
@@ -36,8 +37,10 @@ public class DownloadWorkerManager {
         }
     }
 
-    public static synchronized boolean isVersionDownloading(String version) {
-        return activeVersions.contains(version);
+    public static boolean isVersionDownloading(String version) {
+        synchronized (activeVersionsLock) {
+            return activeVersions.contains(version);
+        }
     }
 
     public static void enqueueDownload(
@@ -58,11 +61,13 @@ public class DownloadWorkerManager {
         initializeIfNeeded(context.getApplicationContext());
 
         // If version is already downloading, don't start another one
-        if (isVersionDownloading(version)) {
-            logger.info("Version " + version + " is already downloading");
-            return;
+        synchronized (activeVersionsLock) {
+            if (activeVersions.contains(version)) {
+                logger.info("Version " + version + " is already downloading");
+                return;
+            }
+            activeVersions.add(version);
         }
-        activeVersions.add(version);
 
         // Create input data
         Data inputData = new Data.Builder()
@@ -114,12 +119,16 @@ public class DownloadWorkerManager {
     public static void cancelVersionDownload(Context context, String version) {
         initializeIfNeeded(context.getApplicationContext());
         WorkManager.getInstance(context).cancelAllWorkByTag(version);
-        activeVersions.remove(version);
+        synchronized (activeVersionsLock) {
+            activeVersions.remove(version);
+        }
     }
 
     public static void cancelAllDownloads(Context context) {
         initializeIfNeeded(context.getApplicationContext());
         WorkManager.getInstance(context).cancelAllWorkByTag("capacitor_updater_download");
-        activeVersions.clear();
+        synchronized (activeVersionsLock) {
+            activeVersions.clear();
+        }
     }
 }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -86,7 +86,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let PLUGIN_VERSION: String = "7.9.0"
+    private let PLUGIN_VERSION: String = "7.9.1"
     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"
@@ -1150,6 +1150,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.checkAppReady()
     }
 
+    private var periodicUpdateTimer: Timer?
+    
     @objc func checkForUpdateAfterDelay() {
         if periodCheckDelay == 0 || !self._isAutoUpdateEnabled() {
             return
@@ -1158,7 +1160,12 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             logger.error("Error no url or wrong format")
             return
         }
-        let timer = Timer.scheduledTimer(withTimeInterval: TimeInterval(periodCheckDelay), repeats: true) { _ in
+        
+        // Clean up any existing timer
+        periodicUpdateTimer?.invalidate()
+        
+        periodicUpdateTimer = Timer.scheduledTimer(withTimeInterval: TimeInterval(periodCheckDelay), repeats: true) { [weak self] _ in
+            guard let self = self else { return }
             DispatchQueue.global(qos: .background).async {
                 let res = self.implementation.getLatest(url: url, channel: nil)
                 let current = self.implementation.getCurrentBundle()
@@ -1169,7 +1176,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 }
             }
         }
-        RunLoop.current.add(timer, forMode: .default)
+        RunLoop.current.add(periodicUpdateTimer!, forMode: .default)
     }
 
     @objc func appMovedToBackground() {

package/package.json

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