@capgo/capacitor-updater 4.44.0 → 4.51.0

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

@@ -55,7 +55,7 @@ public class CapacitorUpdaterPlugin
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "4.44.0";
+  private final String PLUGIN_VERSION = "4.51.0";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -169,11 +169,12 @@ public class CapacitorUpdaterPlugin
       try {
         if (
           !"".equals(previous.getOriginalString()) &&
-          this.currentVersionNative.getMajor() > previous.getMajor()
+          !this.currentVersionNative.getOriginalString()
+            .equals(previous.getOriginalString())
         ) {
           Log.i(
             CapacitorUpdater.TAG,
-            "New native major version detected: " + this.currentVersionNative
+            "New native version detected: " + this.currentVersionNative
           );
           this.implementation.reset(true);
           final List<BundleInfo> installed = this.implementation.list();
@@ -1174,6 +1175,12 @@ public class CapacitorUpdaterPlugin
   }
 
   public void appMovedToForeground() {
+    final BundleInfo current =
+      CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
+    CapacitorUpdaterPlugin.this.implementation.sendStats(
+        "app_moved_to_foreground",
+        current.getVersionName()
+      );
     this._checkCancelDelay(true);
     if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled()) {
       this.backgroundDownload();
@@ -1182,6 +1189,12 @@ public class CapacitorUpdaterPlugin
   }
 
   public void appMovedToBackground() {
+    final BundleInfo current =
+      CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
+    CapacitorUpdaterPlugin.this.implementation.sendStats(
+        "app_moved_to_background",
+        current.getVersionName()
+      );
     Log.i(CapacitorUpdater.TAG, "Checking for pending update");
     try {
       Gson gson = new Gson();
@@ -1237,17 +1250,23 @@ public class CapacitorUpdaterPlugin
   }
 
   private boolean isMainActivity() {
-    Context mContext = this.getContext();
-    ActivityManager activityManager =
-      (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
-    List<ActivityManager.AppTask> runningTasks = activityManager.getAppTasks();
-    ActivityManager.RecentTaskInfo runningTask = runningTasks
-      .get(0)
-      .getTaskInfo();
-    String className = runningTask.baseIntent.getComponent().getClassName();
-    String runningActivity = runningTask.topActivity.getClassName();
-    boolean isThisAppActivity = className.equals(runningActivity);
-    return isThisAppActivity;
+    try {
+      Context mContext = this.getContext();
+      ActivityManager activityManager =
+        (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
+      List<ActivityManager.AppTask> runningTasks =
+        activityManager.getAppTasks();
+      ActivityManager.RecentTaskInfo runningTask = runningTasks
+        .get(0)
+        .getTaskInfo();
+      String className = runningTask.baseIntent.getComponent().getClassName();
+      String runningActivity = runningTask.topActivity.getClassName();
+      boolean isThisAppActivity = className.equals(runningActivity);
+      return isThisAppActivity;
+    } catch (final Exception e) {
+      Log.e(CapacitorUpdater.TAG, "Error getting Main Activity", e);
+      return false;
+    }
   }
 
   @Override

package/ios/Plugin/BundleInfo.swift

@@ -78,7 +78,7 @@ import Foundation
     }
 
     public func getVersionName() -> String {
-        return (self.version ?? "").isEmpty ? BundleInfo.ID_BUILTIN : self.version
+        return self.version.isEmpty ? BundleInfo.ID_BUILTIN : self.version
     }
 
     public func setVersionName(version: String) -> BundleInfo {

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -15,7 +15,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     private var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "4.44.0"
+    private let PLUGIN_VERSION: String = "4.51.0"
     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"
@@ -74,7 +74,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         } catch {
             print("\(self.implementation.TAG) Cannot get version native \(currentVersionNative)")
         }
-        if LatestVersionNative != "0.0.0" && currentVersionNative.major > LatestVersionNative.major {
+        if LatestVersionNative != "0.0.0" && self.currentVersionNative.description != LatestVersionNative.description {
             _ = self._reset(toLastSuccessful: false)
             let res = implementation.list()
             res.forEach { version in
@@ -630,6 +630,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     @objc func appMovedToForeground() {
+        let current: BundleInfo = self.implementation.getCurrentBundle()
+        self.implementation.sendStats(action: "app_moved_to_foreground", versionName: current.getVersionName())
         if backgroundWork != nil && taskRunning {
             backgroundWork!.cancel()
             print("\(self.implementation.TAG) Background Timer Task canceled, Activity resumed before timer completes")
@@ -643,6 +645,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     @objc func appMovedToBackground() {
+        let current: BundleInfo = self.implementation.getCurrentBundle()
+        self.implementation.sendStats(action: "app_moved_to_background", versionName: current.getVersionName())
         print("\(self.implementation.TAG) Check for pending update")
         let delayUpdatePreferences = UserDefaults.standard.string(forKey: DELAY_CONDITION_PREFERENCES) ?? "[]"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.44.0",
+  "version": "4.51.0",
   "packageManager": "pnpm@8.2.0",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
@@ -64,14 +64,14 @@
     "@types/node": "^18.15.11",
     "@typescript-eslint/eslint-plugin": "^5.58.0",
     "@typescript-eslint/parser": "^5.58.0",
-    "eslint": "^8.38.0",
+    "eslint": "^8.39.0",
     "eslint-plugin-import": "^2.27.5",
     "prettier": "^2.8.7",
     "prettier-plugin-java": "^2.1.0",
     "rimraf": "^4.4.1",
-    "rollup": "^3.20.2",
+    "rollup": "^3.20.7",
     "swiftlint": "^1.0.1",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.4"
   },
   "peerDependencies": {
     "@capacitor/core": "^4.0.0 || ^5.0.0"