@capgo/capacitor-updater 4.17.33 → 4.17.34

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

@@ -5,7 +5,6 @@ import android.app.ActivityManager;
 import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
@@ -50,7 +49,7 @@ public class CapacitorUpdaterPlugin
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "4.17.33";
+  private final String PLUGIN_VERSION = "4.17.34";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -67,6 +66,8 @@ public class CapacitorUpdaterPlugin
   private Thread backgroundTask;
   private Boolean taskRunning = false;
 
+  private Boolean isPreviousMainActivity = true;
+
   private volatile Thread appReadyCheck;
 
   @Override
@@ -1217,49 +1218,33 @@ public class CapacitorUpdaterPlugin
     }
   }
 
-  @Override
-  public void onActivityStarted(@NonNull final Activity activity) {
-    this.appMovedToForeground();
-  }
-
-  @Override
-  public void onActivityStopped(@NonNull final Activity activity) {
+  private boolean isMainActivity() {
     Context mContext = this.getContext();
     ActivityManager activityManager = (ActivityManager) mContext.getSystemService(
       Context.ACTIVITY_SERVICE
     );
     List<ActivityManager.AppTask> runningTasks = activityManager.getAppTasks();
-    String runningActivity = runningTasks
-      .get(0)
-      .getTaskInfo()
-      .topActivity.getClassName();
     ActivityManager.RecentTaskInfo runningTask = runningTasks
       .get(0)
       .getTaskInfo();
     String className = runningTask.baseIntent.getComponent().getClassName();
-    ActivityInfo[] activities = null;
-    try {
-      activities =
-        mContext
-          .getPackageManager()
-          .getPackageInfo(
-            mContext.getPackageName(),
-            PackageManager.GET_ACTIVITIES
-          )
-          .activities;
-    } catch (PackageManager.NameNotFoundException e) {
-      e.printStackTrace();
-    }
-    boolean isThisAppActivity = false;
-    for (ActivityInfo activityInfo : activities) {
-      if (
-        activityInfo.name.equals(className) &&
-        !className.equals(runningActivity)
-      ) {
-        isThisAppActivity = true;
-      }
+    String runningActivity = runningTask.topActivity.getClassName();
+    boolean isThisAppActivity = className.equals(runningActivity);
+    return isThisAppActivity;
+  }
+
+  @Override
+  public void onActivityStarted(@NonNull final Activity activity) {
+    if (isPreviousMainActivity) {
+      this.appMovedToForeground();
     }
-    if (!isThisAppActivity) {
+    isPreviousMainActivity = true;
+  }
+
+  @Override
+  public void onActivityStopped(@NonNull final Activity activity) {
+    isPreviousMainActivity = isMainActivity();
+    if (isPreviousMainActivity) {
       this.appMovedToBackground();
     }
   }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -9,7 +9,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     private var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "4.17.33"
+    private let PLUGIN_VERSION: String = "4.17.34"
     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": "4.17.33",
+  "version": "4.17.34",
   "packageManager": "pnpm@7.26.3",
   "license": "LGPL-3.0-only",
   "description": "Live update for capacitor apps",