@capgo/capacitor-updater 6.7.5 → 6.7.6

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

@@ -483,6 +483,17 @@ public class CapacitorUpdater {
     }
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      // Check if app is in foreground using activity lifecycle state
+      boolean isAppForeground =
+        this.activity != null &&
+        !this.activity.isFinishing() &&
+        this.activity.hasWindowFocus();
+      if (!isAppForeground) {
+        // If app is not in foreground, use regular startService instead of startForegroundService
+        Log.d(TAG, "App is in background, aborting downloadFileBackground");
+        return;
+      }
+      Log.d(TAG, "App is in foreground, using startForegroundService");
       this.activity.startForegroundService(intent);
     } else {
       this.activity.startService(intent);

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

@@ -57,7 +57,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private static final String channelUrlDefault =
     "https://plugin.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "6.7.5";
+  private final String PLUGIN_VERSION = "6.7.6";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;

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

@@ -10,9 +10,11 @@ import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Intent;
+import android.content.pm.ServiceInfo;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.PowerManager;
 import android.util.Log;
 import java.io.*;
 import java.io.FileInputStream;
@@ -23,7 +25,6 @@ import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -58,6 +59,10 @@ public class DownloadService extends IntentService {
   private static final String UPDATE_FILE = "update.dat";
   private static final int NOTIFICATION_ID = 1;
   private static final long NOTIFICATION_DELAY_MS = 4000; // 4 seconds
+  private static final String CHANNEL_ID = "CapacitorUpdaterChannel";
+  private static final String CHANNEL_NAME = "Capacitor Updater";
+  private static final String CHANNEL_DESCRIPTION =
+    "Notifications for app updates";
 
   private final OkHttpClient client = new OkHttpClient.Builder()
     .protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1))
@@ -65,6 +70,7 @@ public class DownloadService extends IntentService {
   private Handler handler = new Handler(Looper.getMainLooper());
   private Runnable notificationRunnable;
   private boolean isNotificationShown = false;
+  private PowerManager.WakeLock wakeLock;
 
   public DownloadService() {
     super("Background DownloadService");
@@ -73,35 +79,47 @@ public class DownloadService extends IntentService {
   @Override
   public void onCreate() {
     super.onCreate();
-    notificationRunnable = () -> startForeground();
-    handler.postDelayed(notificationRunnable, NOTIFICATION_DELAY_MS);
+    this.startForegroundService();
   }
 
   @Override
   public void onDestroy() {
     super.onDestroy();
     handler.removeCallbacks(notificationRunnable);
+    Log.w(TAG + " DownloadService", "DownloadService killed/destroyed");
   }
 
-  private void startForeground() {
+  private void startForegroundService() {
     isNotificationShown = true;
-    String channelId = createNotificationChannel();
+    String channelId = createNotificationChannelForDownload();
+
     Notification.Builder builder = new Notification.Builder(this, channelId)
       .setContentTitle("Downloading Update")
       .setContentText("Download in progress")
       .setSmallIcon(android.R.drawable.stat_sys_download)
-      .setOngoing(true);
-
-    startForeground(NOTIFICATION_ID, builder.build());
+      .setOngoing(true)
+      .setPriority(Notification.PRIORITY_MIN)
+      .setCategory(Notification.CATEGORY_SERVICE)
+      .setAutoCancel(false);
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      startForeground(
+        NOTIFICATION_ID,
+        builder.build(),
+        ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+      );
+    } else {
+      startForeground(NOTIFICATION_ID, builder.build());
+    }
   }
 
-  private String createNotificationChannel() {
+  private String createNotificationChannelForDownload() {
     String channelId = "capacitor_updater_channel";
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       NotificationChannel channel = new NotificationChannel(
         channelId,
         "Capacitor Updater Downloads",
-        NotificationManager.IMPORTANCE_LOW
+        NotificationManager.IMPORTANCE_MIN // // High importance to keep service alive
       );
       NotificationManager manager = getSystemService(NotificationManager.class);
       manager.createNotificationChannel(channel);
@@ -385,6 +403,8 @@ public class DownloadService extends IntentService {
           int percent = calcTotalPercent(downloadedBytes, contentLength);
           while (lastNotifiedPercent + 10 <= percent) {
             lastNotifiedPercent += 10;
+            // Artificial delay using CPU-bound calculation to take ~5 seconds
+            double result = 0;
             notifyDownload(id, lastNotifiedPercent);
           }
         }
@@ -592,4 +612,45 @@ public class DownloadService extends IntentService {
       }
     }
   }
+
+  private void createNotificationChannel() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      NotificationChannel channel = new NotificationChannel(
+        CHANNEL_ID,
+        CHANNEL_NAME,
+        NotificationManager.IMPORTANCE_MAX
+      );
+      channel.setDescription(CHANNEL_DESCRIPTION);
+      NotificationManager notificationManager = getSystemService(
+        NotificationManager.class
+      );
+      notificationManager.createNotificationChannel(channel);
+    }
+  }
+
+  private void showNotification(String text, int progress) {
+    Notification.Builder builder = new Notification.Builder(this, CHANNEL_ID)
+      .setSmallIcon(android.R.drawable.stat_sys_download)
+      .setContentTitle("App Update")
+      .setContentText(text)
+      // .setPriority(Notification.PRIORITY_LOW)
+      .setOngoing(true);
+
+    if (progress > 0) {
+      builder.setProgress(100, progress, false);
+    }
+
+    startForeground(NOTIFICATION_ID, builder.build());
+  }
+
+  // Update the notification progress
+  private void updateNotificationProgress(int progress) {
+    showNotification("Downloading OTA update... " + progress + "%", progress);
+  }
+
+  // When download completes or fails
+  private void stopForegroundService() {
+    stopForeground(true);
+    stopSelf();
+  }
 }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -44,7 +44,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isAutoUpdateAvailable", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "6.7.5"
+    private let PLUGIN_VERSION: String = "6.7.6"
     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"

package/package.json

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