@capgo/capacitor-updater 5.7.4 → 5.7.7

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

@@ -48,6 +48,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.zip.CRC32;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -288,11 +289,11 @@ public class CapacitorUpdater {
       String action = intent.getAction();
       Bundle bundle = intent.getExtras();
       if (bundle != null) {
-        if (action == DownloadService.PERCENTDOWNLOAD) {
+        if (Objects.equals(action, DownloadService.PERCENTDOWNLOAD)) {
           String id = bundle.getString(DownloadService.ID);
           int percent = bundle.getInt(DownloadService.PERCENT);
           CapacitorUpdater.this.notifyDownload(id, percent);
-        } else if (action == DownloadService.NOTIFICATION) {
+        } else if (Objects.equals(action, DownloadService.NOTIFICATION)) {
           String id = bundle.getString(DownloadService.ID);
           String dest = bundle.getString(DownloadService.FILEDEST);
           String version = bundle.getString(DownloadService.VERSION);
@@ -447,7 +448,7 @@ public class CapacitorUpdater {
     final URLConnection connection = u.openConnection();
 
     final File target = new File(this.documentsDir, dest);
-    target.getParentFile().mkdirs();
+    Objects.requireNonNull(target.getParentFile()).mkdirs();
     target.createNewFile();
 
     final long totalLength = connection.getContentLength();
@@ -640,7 +641,7 @@ public class CapacitorUpdater {
     final File destHot = new File(this.documentsDir, bundleDirectory);
     Log.d(TAG, "list File : " + destHot.getPath());
     if (destHot.exists()) {
-      for (final File i : destHot.listFiles()) {
+      for (final File i : Objects.requireNonNull(destHot.listFiles())) {
         final String id = i.getName();
         res.add(this.getBundleInfo(id));
       }
@@ -872,9 +873,7 @@ public class CapacitorUpdater {
 
   public void unsetChannel(final Callback callback) {
     String channelUrl = this.channelUrl;
-    if (
-      channelUrl == null || "".equals(channelUrl) || channelUrl.length() == 0
-    ) {
+    if (channelUrl == null || channelUrl.isEmpty()) {
       Log.e(TAG, "Channel URL is not set");
       final JSObject retError = new JSObject();
       retError.put("message", "channelUrl missing");
@@ -939,9 +938,7 @@ public class CapacitorUpdater {
 
   public void setChannel(final String channel, final Callback callback) {
     String channelUrl = this.channelUrl;
-    if (
-      channelUrl == null || "".equals(channelUrl) || channelUrl.length() == 0
-    ) {
+    if (channelUrl == null || channelUrl.isEmpty()) {
       Log.e(TAG, "Channel URL is not set");
       final JSObject retError = new JSObject();
       retError.put("message", "channelUrl missing");
@@ -1004,9 +1001,7 @@ public class CapacitorUpdater {
 
   public void getChannel(final Callback callback) {
     String channelUrl = this.channelUrl;
-    if (
-      channelUrl == null || "".equals(channelUrl) || channelUrl.length() == 0
-    ) {
+    if (channelUrl == null || channelUrl.isEmpty()) {
       Log.e(TAG, "Channel URL is not set");
       final JSObject retError = new JSObject();
       retError.put("message", "Channel URL is not set");
@@ -1068,7 +1063,7 @@ public class CapacitorUpdater {
 
   public void sendStats(final String action, final String versionName) {
     String statsUrl = this.statsUrl;
-    if (statsUrl == null || "".equals(statsUrl) || statsUrl.length() == 0) {
+    if (statsUrl == null || statsUrl.isEmpty()) {
       return;
     }
     JSONObject json = null;
@@ -1192,7 +1187,7 @@ public class CapacitorUpdater {
 
   public String getCurrentBundlePath() {
     String path = this.prefs.getString(WebView.CAP_SERVER_PATH, "public");
-    if ("".equals(path.trim())) {
+    if (path.trim().isEmpty()) {
       return "public";
     }
     return path;

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

@@ -8,7 +8,6 @@ package ee.forgr.capacitor_updater;
 
 import android.app.Activity;
 import android.app.ActivityManager;
-import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
@@ -36,6 +35,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.UUID;
@@ -55,7 +55,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "5.7.4";
+  private final String PLUGIN_VERSION = "5.7.7";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -70,7 +70,6 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private Boolean autoUpdate = false;
   private String updateUrl = "";
   private Version currentVersionNative;
-  private Boolean resetWhenUpdate = true;
   private Thread backgroundTask;
   private Boolean taskRunning = false;
 
@@ -167,7 +166,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     this.implementation.appId =
       this.getConfig().getString("appId", this.implementation.appId);
     if (
-      this.implementation.appId == null || "".equals(this.implementation.appId)
+      this.implementation.appId == null || this.implementation.appId.isEmpty()
     ) {
       // crash the app
       throw new RuntimeException(
@@ -215,32 +214,29 @@ public class CapacitorUpdaterPlugin extends Plugin {
     this.appReadyTimeout = this.getConfig().getInt("appReadyTimeout", 10000);
     this.implementation.timeout =
       this.getConfig().getInt("responseTimeout", 20) * 1000;
-    this.resetWhenUpdate = this.getConfig().getBoolean("resetWhenUpdate", true);
+    boolean resetWhenUpdate =
+      this.getConfig().getBoolean("resetWhenUpdate", true);
 
-    if (this.resetWhenUpdate) {
+    if (resetWhenUpdate) {
       this.cleanupObsoleteVersions();
     }
-    final Application application = (Application) this.getContext()
-      .getApplicationContext();
 
     this.checkForUpdateAfterDelay();
-    //    application.registerActivityLifecycleCallbacks(this);
   }
 
   private void semaphoreWait(Number waitTime) {
     Log.i(CapacitorUpdater.TAG, "semaphoreWait " + waitTime);
     try {
       //        Log.i(CapacitorUpdater.TAG, "semaphoreReady count " + CapacitorUpdaterPlugin.this.semaphoreReady.getCount());
-      CapacitorUpdaterPlugin.this.semaphoreReady.awaitAdvanceInterruptibly(
-          CapacitorUpdaterPlugin.this.semaphoreReady.getPhase(),
-          waitTime.longValue(),
-          TimeUnit.SECONDS
-        );
+      semaphoreReady.awaitAdvanceInterruptibly(
+        semaphoreReady.getPhase(),
+        waitTime.longValue(),
+        TimeUnit.SECONDS
+      );
       //        Log.i(CapacitorUpdater.TAG, "semaphoreReady await " + res);
       Log.i(
         CapacitorUpdater.TAG,
-        "semaphoreReady count " +
-        CapacitorUpdaterPlugin.this.semaphoreReady.getPhase()
+        "semaphoreReady count " + semaphoreReady.getPhase()
       );
     } catch (InterruptedException e) {
       Log.i(CapacitorUpdater.TAG, "semaphoreWait InterruptedException");
@@ -252,17 +248,16 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
   private void semaphoreUp() {
     Log.i(CapacitorUpdater.TAG, "semaphoreUp");
-    CapacitorUpdaterPlugin.this.semaphoreReady.register();
+    semaphoreReady.register();
   }
 
   private void semaphoreDown() {
     Log.i(CapacitorUpdater.TAG, "semaphoreDown");
     Log.i(
       CapacitorUpdater.TAG,
-      "semaphoreDown count " +
-      CapacitorUpdaterPlugin.this.semaphoreReady.getPhase()
+      "semaphoreDown count " + semaphoreReady.getPhase()
     );
-    CapacitorUpdaterPlugin.this.semaphoreReady.arriveAndDeregister();
+    semaphoreReady.arriveAndDeregister();
   }
 
   private void sendReadyToJs(final BundleInfo current, final String msg) {
@@ -292,8 +287,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
       try {
         if (
           !"".equals(previous.getOriginalString()) &&
-          !this.currentVersionNative.getOriginalString()
-            .equals(previous.getOriginalString())
+          !Objects.equals(
+            this.currentVersionNative.getOriginalString(),
+            previous.getOriginalString()
+          )
         ) {
           Log.i(
             CapacitorUpdater.TAG,
@@ -483,7 +480,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             } else {
               if (
                 CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() &&
-                triggerAutoUpdate
+                Boolean.TRUE.equals(triggerAutoUpdate)
               ) {
                 Log.i(
                   CapacitorUpdater.TAG,
@@ -528,7 +525,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
               } else {
                 if (
                   CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() &&
-                  triggerAutoUpdate
+                  Boolean.TRUE.equals(triggerAutoUpdate)
                 ) {
                   Log.i(
                     CapacitorUpdater.TAG,
@@ -606,7 +603,12 @@ public class CapacitorUpdaterPlugin extends Plugin {
           final JSObject ret = new JSObject();
           ret.put("version", version);
           CapacitorUpdaterPlugin.this.notifyListeners("downloadFailed", ret);
-          CapacitorUpdaterPlugin.this.implementation.sendStats("download_fail");
+          final BundleInfo current =
+            CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
+          CapacitorUpdaterPlugin.this.implementation.sendStats(
+              "download_fail",
+              current.getVersionName()
+            );
         }
       });
     } catch (final Exception e) {
@@ -615,7 +617,12 @@ public class CapacitorUpdaterPlugin extends Plugin {
       final JSObject ret = new JSObject();
       ret.put("version", version);
       CapacitorUpdaterPlugin.this.notifyListeners("downloadFailed", ret);
-      CapacitorUpdaterPlugin.this.implementation.sendStats("download_fail");
+      final BundleInfo current =
+        CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
+      CapacitorUpdaterPlugin.this.implementation.sendStats(
+          "download_fail",
+          current.getVersionName()
+        );
     }
   }
 
@@ -822,9 +829,6 @@ public class CapacitorUpdaterPlugin extends Plugin {
     if (this.periodCheckDelay == 0 || !this._isAutoUpdateEnabled()) {
       return;
     }
-    // The delay should be equal to this.periodCheckDelay.
-    // In appMovedToForeground we schedule a backgroundDownload and it happens BEFORE this scheduleAtFixedRate
-    // As such we get a race condition
     final Timer timer = new Timer();
     timer.scheduleAtFixedRate(
       new TimerTask() {
@@ -835,14 +839,17 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 CapacitorUpdaterPlugin.this.updateUrl,
                 res -> {
                   if (res.has("error")) {
-                    Log.e(CapacitorUpdater.TAG, res.getString("error"));
+                    Log.e(
+                      CapacitorUpdater.TAG,
+                      Objects.requireNonNull(res.getString("error"))
+                    );
                     return;
                   } else if (res.has("version")) {
                     String newVersion = res.getString("version");
                     String currentVersion = String.valueOf(
                       CapacitorUpdaterPlugin.this.implementation.getCurrentBundle()
                     );
-                    if (!newVersion.equals(currentVersion)) {
+                    if (!Objects.equals(newVersion, currentVersion)) {
                       Log.i(
                         CapacitorUpdater.TAG,
                         "New version found: " + newVersion
@@ -857,7 +864,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
           }
         }
       },
-      this.periodCheckDelay,
+      0,
       this.periodCheckDelay
     );
   }
@@ -967,7 +974,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     for (DelayCondition condition : delayConditionList) {
       String kind = condition.getKind().toString();
       String value = condition.getValue();
-      if (!"".equals(kind)) {
+      if (!kind.isEmpty()) {
         switch (kind) {
           case "background":
             if (!killed) {
@@ -1020,7 +1027,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private Boolean _isAutoUpdateEnabled() {
     final CapConfig config = CapConfig.loadDefault(this.getActivity());
     String serverUrl = config.getServerUrl();
-    if (serverUrl != null && !"".equals(serverUrl)) {
+    if (serverUrl != null && !serverUrl.isEmpty()) {
       // log warning autoupdate disabled when serverUrl is set
       Log.w(
         CapacitorUpdater.TAG,
@@ -1030,7 +1037,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     return (
       CapacitorUpdaterPlugin.this.autoUpdate &&
       !"".equals(CapacitorUpdaterPlugin.this.updateUrl) &&
-      (serverUrl == null || "".equals(serverUrl))
+      (serverUrl == null || serverUrl.isEmpty())
     );
   }
 
@@ -1077,7 +1084,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
     Boolean error
   ) {
     if (error) {
-      Log.i(CapacitorUpdater.TAG, "endBackGroundTaskWithNotif error" + error);
+      Log.i(
+        CapacitorUpdater.TAG,
+        "endBackGroundTaskWithNotif error" + error.toString()
+      );
       this.implementation.sendStats("download_fail", current.getVersionName());
       final JSObject ret = new JSObject();
       ret.put("version", latestVersionName);
@@ -1149,7 +1159,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
               if (
                 latestVersionName != null &&
-                !"".equals(latestVersionName) &&
+                !latestVersionName.isEmpty() &&
                 !current.getVersionName().equals(latestVersionName)
               ) {
                 final BundleInfo latest =
@@ -1308,7 +1318,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         delayUpdatePreferences,
         type
       );
-      if (delayConditionList != null && delayConditionList.size() != 0) {
+      if (delayConditionList != null && !delayConditionList.isEmpty()) {
         Log.i(CapacitorUpdater.TAG, "Update delayed to next backgrounding");
         return;
       }
@@ -1442,8 +1452,11 @@ public class CapacitorUpdaterPlugin extends Plugin {
   }
 
   public void appMovedToBackground() {
+    final BundleInfo current =
+      CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
     CapacitorUpdaterPlugin.this.implementation.sendStats(
-        "app_moved_to_background"
+        "app_moved_to_background",
+        current.getVersionName()
       );
     Log.i(CapacitorUpdater.TAG, "Checking for pending update");
     try {
@@ -1504,10 +1517,12 @@ public class CapacitorUpdaterPlugin extends Plugin {
       ActivityManager.RecentTaskInfo runningTask = runningTasks
         .get(0)
         .getTaskInfo();
-      String className = runningTask.baseIntent.getComponent().getClassName();
+      String className = Objects
+        .requireNonNull(runningTask.baseIntent.getComponent())
+        .getClassName();
+      assert runningTask.topActivity != null;
       String runningActivity = runningTask.topActivity.getClassName();
-      boolean isThisAppActivity = className.equals(runningActivity);
-      return isThisAppActivity;
+      return className.equals(runningActivity);
     } catch (NullPointerException e) {
       return false;
     }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -15,7 +15,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "5.7.4"
+    private let PLUGIN_VERSION: String = "5.7.7"
     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"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "5.7.4",
+  "version": "5.7.7",
   "packageManager": "pnpm@8.15.4",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",