@capgo/capacitor-updater 6.7.7-alpha.2 → 6.7.7-alpha.3

package/android/build.gradle

@@ -49,10 +49,13 @@ repositories {
 
 
 dependencies {
+    def work_version = "2.9.1"
+    implementation "androidx.work:work-runtime:$work_version"
+    implementation "com.google.android.gms:play-services-tasks:18.2.0"
+    implementation "com.google.guava:guava:32.1.3-android"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
-//     implementation 'com.android.volley:volley:1.2.1'
     implementation 'io.github.g00fy2:versioncompare:1.5.0'
     implementation 'com.google.code.gson:gson:2.11.0'
     testImplementation "junit:junit:$junitVersion"

package/android/src/main/AndroidManifest.xml

@@ -1,9 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    
     <application>
-        <service 
-            android:name="ee.forgr.capacitor_updater.DownloadService"
-            android:exported="false" />
     </application>
 </manifest>

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

@@ -6,21 +6,21 @@
 
 package ee.forgr.capacitor_updater;
 
-import static android.content.Context.RECEIVER_NOT_EXPORTED;
-
-import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Build;
-import android.os.Bundle;
 import android.util.Base64;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.work.Data;
+import androidx.work.WorkInfo;
+import androidx.work.WorkManager;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.plugin.WebView;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.File;
@@ -29,9 +29,6 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
 import java.security.GeneralSecurityException;
 import java.security.MessageDigest;
 import java.security.PrivateKey;
@@ -251,87 +248,130 @@ public class CapacitorUpdater {
     sourceFile.delete();
   }
 
-  @SuppressLint("UnspecifiedRegisterReceiverFlag")
-  public void onResume() {
-    IntentFilter filter = new IntentFilter();
-    filter.addAction(DownloadService.NOTIFICATION);
-    filter.addAction(DownloadService.PERCENTDOWNLOAD);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-      this.activity.registerReceiver(receiver, filter, RECEIVER_NOT_EXPORTED);
-    } else {
-      this.activity.registerReceiver(receiver, filter);
+  private void observeWorkProgress(Context context, String id) {
+    if (!(context instanceof LifecycleOwner)) {
+      Log.e(
+        TAG,
+        "Context is not a LifecycleOwner, cannot observe work progress"
+      );
+      return;
     }
-  }
 
-  public void onPause() {
-    this.activity.unregisterReceiver(receiver);
-  }
+    activity.runOnUiThread(() -> {
+      WorkManager.getInstance(context)
+        .getWorkInfosByTagLiveData(id)
+        .observe((LifecycleOwner) context, workInfos -> {
+          if (workInfos == null || workInfos.isEmpty()) return;
+
+          WorkInfo workInfo = workInfos.get(0);
+          Data progress = workInfo.getProgress();
+
+          switch (workInfo.getState()) {
+            case RUNNING:
+              int percent = progress.getInt(DownloadService.PERCENT, 0);
+              notifyDownload(id, percent);
+              break;
+            case SUCCEEDED:
+              Data outputData = workInfo.getOutputData();
+              String dest = outputData.getString(DownloadService.FILEDEST);
+              String version = outputData.getString(DownloadService.VERSION);
+              String sessionKey = outputData.getString(
+                DownloadService.SESSIONKEY
+              );
+              String checksum = outputData.getString(DownloadService.CHECKSUM);
+              boolean isManifest = outputData.getBoolean(
+                DownloadService.IS_MANIFEST,
+                false
+              );
 
-  private final BroadcastReceiver receiver = new BroadcastReceiver() {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      String action = intent.getAction();
-      Bundle bundle = intent.getExtras();
-      if (bundle != null) {
-        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 (Objects.equals(action, DownloadService.NOTIFICATION)) {
-          String id = bundle.getString(DownloadService.ID);
-          String dest = bundle.getString(DownloadService.FILEDEST);
-          String version = bundle.getString(DownloadService.VERSION);
-          String sessionKey = bundle.getString(DownloadService.SESSIONKEY);
-          String checksum = bundle.getString(DownloadService.CHECKSUM);
-          String error = bundle.getString(DownloadService.ERROR);
-          boolean isManifest = bundle.getBoolean(
-            DownloadService.IS_MANIFEST,
-            false
-          );
-          Log.i(
-            CapacitorUpdater.TAG,
-            "res " +
-            id +
-            " " +
-            dest +
-            " " +
-            version +
-            " " +
-            sessionKey +
-            " " +
-            checksum +
-            " " +
-            error
-          );
-          if (dest == null) {
-            final JSObject ret = new JSObject();
-            ret.put(
-              "version",
-              CapacitorUpdater.this.getCurrentBundle().getVersionName()
-            );
-            if ("low_mem_fail".equals(error)) {
-              CapacitorUpdater.this.sendStats("low_mem_fail", version);
-            }
-            ret.put("error", "download_fail");
-            CapacitorUpdater.this.sendStats("download_fail", version);
-            CapacitorUpdater.this.notifyListeners("downloadFailed", ret);
-            return;
+              boolean success = finishDownload(
+                id,
+                dest,
+                version,
+                sessionKey,
+                checksum,
+                true,
+                isManifest
+              );
+              if (!success) {
+                saveBundleInfo(
+                  id,
+                  new BundleInfo(
+                    id,
+                    version,
+                    BundleStatus.ERROR,
+                    new Date(System.currentTimeMillis()),
+                    ""
+                  )
+                );
+                JSObject ret = new JSObject();
+                ret.put("version", getCurrentBundle().getVersionName());
+                ret.put("error", "finish_download_fail");
+                sendStats("finish_download_fail", version);
+                notifyListeners("downloadFailed", ret);
+              }
+              break;
+            case FAILED:
+              Data failedData = workInfo.getOutputData();
+              String error = failedData.getString(DownloadService.ERROR);
+              String failedVersion = failedData.getString(
+                DownloadService.VERSION
+              );
+              saveBundleInfo(
+                id,
+                new BundleInfo(
+                  id,
+                  failedVersion,
+                  BundleStatus.ERROR,
+                  new Date(System.currentTimeMillis()),
+                  ""
+                )
+              );
+              JSObject ret = new JSObject();
+              ret.put("version", getCurrentBundle().getVersionName());
+              if ("low_mem_fail".equals(error)) {
+                sendStats("low_mem_fail", failedVersion);
+              }
+              ret.put("error", error != null ? error : "download_fail");
+              sendStats("download_fail", failedVersion);
+              notifyListeners("downloadFailed", ret);
+              break;
           }
-          CapacitorUpdater.this.finishDownload(
-              id,
-              dest,
-              version,
-              sessionKey,
-              checksum,
-              true,
-              isManifest
-            );
-        } else {
-          Log.i(TAG, "Unknown action " + action);
-        }
-      }
+        });
+    });
+  }
+
+  private void download(
+    final String id,
+    final String url,
+    final String dest,
+    final String version,
+    final String sessionKey,
+    final String checksum,
+    final JSONArray manifest
+  ) {
+    if (this.activity == null) {
+      Log.e(TAG, "Activity is null, cannot observe work progress");
+      return;
     }
-  };
+    observeWorkProgress(this.activity, id);
+
+    DownloadWorkerManager.enqueueDownload(
+      this.activity,
+      url,
+      id,
+      this.documentsDir.getAbsolutePath(),
+      dest,
+      version,
+      sessionKey,
+      checksum,
+      manifest != null
+    );
+
+    if (manifest != null) {
+      DataManager.getInstance().setManifest(manifest);
+    }
+  }
 
   private String decryptChecksum(String checksum, String version)
     throws IOException {
@@ -457,77 +497,6 @@ public class CapacitorUpdater {
     return true;
   }
 
-  private void downloadFileBackground(
-    final String id,
-    final String url,
-    final String version,
-    final String sessionKey,
-    final String checksum,
-    final String dest,
-    final JSONArray manifest
-  ) {
-    Intent intent = new Intent(this.activity, DownloadService.class);
-    intent.putExtra(DownloadService.URL, url);
-    intent.putExtra(DownloadService.FILEDEST, dest);
-    intent.putExtra(
-      DownloadService.DOCDIR,
-      this.documentsDir.getAbsolutePath()
-    );
-    intent.putExtra(DownloadService.ID, id);
-    intent.putExtra(DownloadService.VERSION, version);
-    intent.putExtra(DownloadService.SESSIONKEY, sessionKey);
-    intent.putExtra(DownloadService.CHECKSUM, checksum);
-    if (manifest != null) {
-      DataManager.getInstance().setManifest(manifest);
-      intent.putExtra(DownloadService.IS_MANIFEST, true);
-    }
-
-    this.activity.startService(intent);
-  }
-
-  private void downloadFile(
-    final String id,
-    final String url,
-    final String dest
-  ) throws IOException {
-    final URL u = new URL(url);
-    final URLConnection connection = u.openConnection();
-
-    final File target = new File(this.documentsDir, dest);
-    Objects.requireNonNull(target.getParentFile()).mkdirs();
-    target.createNewFile();
-
-    final long totalLength = connection.getContentLength();
-    int bytesRead = 0;
-    int percent = 0;
-    this.notifyDownload(id, 10);
-
-    try (
-      InputStream is = connection.getInputStream();
-      DataInputStream dis = new DataInputStream(is);
-      FileOutputStream fos = new FileOutputStream(target)
-    ) {
-      byte[] buffer = new byte[8192];
-      int length;
-      while ((length = dis.read(buffer)) > 0) {
-        fos.write(buffer, 0, length);
-        bytesRead += length;
-        final int newPercent = (int) ((bytesRead / (float) totalLength) * 100);
-        if (totalLength > 1 && newPercent != percent) {
-          percent = newPercent;
-          this.notifyDownload(id, this.calcTotalPercent(percent, 10, 70));
-        }
-      }
-      if (bytesRead == 0) {
-        throw new IOException("Failed to download: No data read from URL");
-      }
-    } catch (OutOfMemoryError e) {
-      Log.e(TAG, "OutOfMemoryError while downloading file", e);
-      this.sendStats("low_mem_fail");
-      throw new IOException("OutOfMemoryError while downloading file");
-    }
-  }
-
   private void deleteDirectory(final File file) throws IOException {
     if (file.isDirectory()) {
       final File[] entries = file.listFiles();
@@ -727,6 +696,16 @@ public class CapacitorUpdater {
     final JSONArray manifest
   ) {
     final String id = this.randomString();
+
+    // Check if version is already downloading
+    if (
+      this.activity != null &&
+      DownloadWorkerManager.isVersionDownloading(version)
+    ) {
+      Log.i(TAG, "Version already downloading: " + version);
+      return;
+    }
+
     this.saveBundleInfo(
         id,
         new BundleInfo(
@@ -740,13 +719,13 @@ public class CapacitorUpdater {
     this.notifyDownload(id, 0);
     this.notifyDownload(id, 5);
 
-    this.downloadFileBackground(
+    this.download(
         id,
         url,
+        this.randomString(),
         version,
         sessionKey,
         checksum,
-        this.randomString(),
         manifest
       );
   }
@@ -771,29 +750,68 @@ public class CapacitorUpdater {
     this.notifyDownload(id, 0);
     this.notifyDownload(id, 5);
     final String dest = this.randomString();
-    this.downloadFile(id, url, dest);
-    final Boolean finished =
-      this.finishDownload(
+
+    // Use the new WorkManager-based download
+    this.download(id, url, dest, version, sessionKey, checksum, null);
+
+    // Wait for completion
+    try {
+      ListenableFuture<List<WorkInfo>> future = WorkManager.getInstance(
+        activity
+      ).getWorkInfosByTag(id);
+
+      List<WorkInfo> workInfos = Futures.getChecked(future, IOException.class);
+
+      if (workInfos != null && !workInfos.isEmpty()) {
+        WorkInfo workInfo = workInfos.get(0);
+        while (!workInfo.getState().isFinished()) {
+          Thread.sleep(100);
+          workInfos = Futures.getChecked(
+            WorkManager.getInstance(activity).getWorkInfosByTag(id),
+            IOException.class
+          );
+          if (workInfos != null && !workInfos.isEmpty()) {
+            workInfo = workInfos.get(0);
+          }
+        }
+
+        if (workInfo.getState() == WorkInfo.State.SUCCEEDED) {
+          Data outputData = workInfo.getOutputData();
+          boolean success = finishDownload(
+            id,
+            outputData.getString(DownloadService.FILEDEST),
+            version,
+            sessionKey,
+            checksum,
+            true,
+            false
+          );
+          if (!success) {
+            throw new IOException("Failed to finish download");
+          }
+        } else {
+          Data outputData = workInfo.getOutputData();
+          String error = outputData.getString(DownloadService.ERROR);
+          throw new IOException(
+            error != null ? error : "Download failed: " + workInfo.getState()
+          );
+        }
+      }
+      return getBundleInfo(id);
+    } catch (Exception e) {
+      Log.e(TAG, "Error waiting for download", e);
+      saveBundleInfo(
+        id,
+        new BundleInfo(
           id,
-          dest,
           version,
-          sessionKey,
-          checksum,
-          false,
-          false
-        );
-    final BundleStatus status = finished
-      ? BundleStatus.PENDING
-      : BundleStatus.ERROR;
-    BundleInfo info = new BundleInfo(
-      id,
-      version,
-      status,
-      new Date(System.currentTimeMillis()),
-      checksum
-    );
-    this.saveBundleInfo(id, info);
-    return info;
+          BundleStatus.ERROR,
+          new Date(System.currentTimeMillis()),
+          ""
+        )
+      );
+      throw new IOException("Error waiting for download: " + e.getMessage());
+    }
   }
 
   public List<BundleInfo> list() {
@@ -818,6 +836,13 @@ public class CapacitorUpdater {
       Log.e(TAG, "Cannot delete " + id);
       return false;
     }
+    // Cancel download for this version if active
+    if (this.activity != null) {
+      DownloadWorkerManager.cancelVersionDownload(
+        this.activity,
+        deleted.getVersionName()
+      );
+    }
     final File bundle = new File(this.documentsDir, bundleDirectory + "/" + id);
     if (bundle.exists()) {
       this.deleteDirectory(bundle);
@@ -929,6 +954,10 @@ public class CapacitorUpdater {
     this.setCurrentBundle(new File("public"));
     this.setFallbackBundle(null);
     this.setNextBundle(null);
+    // Cancel any ongoing downloads
+    if (this.activity != null) {
+      DownloadWorkerManager.cancelAllDownloads(this.activity);
+    }
     if (!internal) {
       this.sendStats(
           "reset",
@@ -970,7 +999,7 @@ public class CapacitorUpdater {
       .enqueue(
         new okhttp3.Callback() {
           @Override
-          public void onFailure(Call call, IOException e) {
+          public void onFailure(@NonNull Call call, @NonNull IOException e) {
             JSObject retError = new JSObject();
             retError.put("message", "Request failed: " + e.getMessage());
             retError.put("error", "network_error");
@@ -978,8 +1007,10 @@ public class CapacitorUpdater {
           }
 
           @Override
-          public void onResponse(Call call, Response response)
-            throws IOException {
+          public void onResponse(
+            @NonNull Call call,
+            @NonNull Response response
+          ) throws IOException {
             try (ResponseBody responseBody = response.body()) {
               if (!response.isSuccessful()) {
                 JSObject retError = new JSObject();
@@ -989,6 +1020,7 @@ public class CapacitorUpdater {
                 return;
               }
 
+              assert responseBody != null;
               String responseData = responseBody.string();
               JSONObject jsonResponse = new JSONObject(responseData);
               JSObject ret = new JSObject();
@@ -1068,7 +1100,7 @@ public class CapacitorUpdater {
       .enqueue(
         new okhttp3.Callback() {
           @Override
-          public void onFailure(Call call, IOException e) {
+          public void onFailure(@NonNull Call call, @NonNull IOException e) {
             JSObject retError = new JSObject();
             retError.put("message", "Request failed: " + e.getMessage());
             retError.put("error", "network_error");
@@ -1076,8 +1108,10 @@ public class CapacitorUpdater {
           }
 
           @Override
-          public void onResponse(Call call, Response response)
-            throws IOException {
+          public void onResponse(
+            @NonNull Call call,
+            @NonNull Response response
+          ) throws IOException {
             try (ResponseBody responseBody = response.body()) {
               if (!response.isSuccessful()) {
                 JSObject retError = new JSObject();
@@ -1087,6 +1121,7 @@ public class CapacitorUpdater {
                 return;
               }
 
+              assert responseBody != null;
               String responseData = responseBody.string();
               JSONObject jsonResponse = new JSONObject(responseData);
               JSObject ret = new JSObject();
@@ -1171,7 +1206,7 @@ public class CapacitorUpdater {
       .enqueue(
         new okhttp3.Callback() {
           @Override
-          public void onFailure(Call call, IOException e) {
+          public void onFailure(@NonNull Call call, @NonNull IOException e) {
             JSObject retError = new JSObject();
             retError.put("message", "Request failed: " + e.getMessage());
             retError.put("error", "network_error");
@@ -1179,10 +1214,13 @@ public class CapacitorUpdater {
           }
 
           @Override
-          public void onResponse(Call call, Response response)
-            throws IOException {
+          public void onResponse(
+            @NonNull Call call,
+            @NonNull Response response
+          ) throws IOException {
             try (ResponseBody responseBody = response.body()) {
               if (response.code() == 400) {
+                assert responseBody != null;
                 String data = responseBody.string();
                 if (
                   data.contains("channel_not_found") &&
@@ -1205,6 +1243,7 @@ public class CapacitorUpdater {
                 return;
               }
 
+              assert responseBody != null;
               String responseData = responseBody.string();
               JSONObject jsonResponse = new JSONObject(responseData);
               JSObject ret = new JSObject();
@@ -1269,13 +1308,15 @@ public class CapacitorUpdater {
       .enqueue(
         new okhttp3.Callback() {
           @Override
-          public void onFailure(Call call, IOException e) {
+          public void onFailure(@NonNull Call call, @NonNull IOException e) {
             Log.e(TAG, "Failed to send stats: " + e.getMessage());
           }
 
           @Override
-          public void onResponse(Call call, Response response)
-            throws IOException {
+          public void onResponse(
+            @NonNull Call call,
+            @NonNull Response response
+          ) throws IOException {
             if (response.isSuccessful()) {
               Log.i(
                 TAG,

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.7-alpha.2";
+  private final String PLUGIN_VERSION = "6.7.7-alpha.3";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -1658,13 +1658,11 @@ public class CapacitorUpdaterPlugin extends Plugin {
       backgroundTask.interrupt();
     }
     this.implementation.activity = getActivity();
-    this.implementation.onResume();
   }
 
   @Override
   public void handleOnPause() {
     this.implementation.activity = getActivity();
-    this.implementation.onPause();
   }
 
   @Override

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

@@ -5,10 +5,12 @@
  */
 package ee.forgr.capacitor_updater;
 
-import android.app.IntentService;
-import android.content.Intent;
-import android.os.PowerManager;
+import android.content.Context;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.work.Data;
+import androidx.work.Worker;
+import androidx.work.WorkerParameters;
 import java.io.*;
 import java.io.FileInputStream;
 import java.net.HttpURLConnection;
@@ -18,6 +20,7 @@ import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -33,7 +36,7 @@ import org.brotli.dec.BrotliInputStream;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-public class DownloadService extends IntentService {
+public class DownloadService extends Worker {
 
   public static final String TAG = "Capacitor-updater";
   public static final String URL = "URL";
@@ -45,68 +48,62 @@ public class DownloadService extends IntentService {
   public static final String VERSION = "version";
   public static final String SESSIONKEY = "sessionkey";
   public static final String CHECKSUM = "checksum";
-  public static final String NOTIFICATION = "service receiver";
-  public static final String PERCENTDOWNLOAD = "percent receiver";
   public static final String IS_MANIFEST = "is_manifest";
-  public static final String MANIFEST = "manifest";
   private static final String UPDATE_FILE = "update.dat";
 
   private final OkHttpClient client = new OkHttpClient.Builder()
     .protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1))
     .build();
-  private PowerManager.WakeLock wakeLock;
 
-  public DownloadService() {
-    super("Background DownloadService");
+  public DownloadService(
+    @NonNull Context context,
+    @NonNull WorkerParameters params
+  ) {
+    super(context, params);
   }
 
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
-    wakeLock = powerManager.newWakeLock(
-      PowerManager.PARTIAL_WAKE_LOCK,
-      "CapacitorUpdater::DownloadWakeLock"
-    );
+  private void setProgress(int percent) {
+    Data progress = new Data.Builder().putInt(PERCENT, percent).build();
+    setProgressAsync(progress);
   }
 
-  @Override
-  public void onDestroy() {
-    super.onDestroy();
-    Log.w(TAG + " DownloadService", "DownloadService killed/destroyed");
-    if (wakeLock != null && wakeLock.isHeld()) {
-      wakeLock.release();
-    }
+  private Result createFailureResult(String error) {
+    Data output = new Data.Builder().putString(ERROR, error).build();
+    return Result.failure(output);
   }
 
-  private int calcTotalPercent(long downloadedBytes, long contentLength) {
-    if (contentLength <= 0) {
-      return 0;
-    }
-    int percent = (int) (((double) downloadedBytes / contentLength) * 100);
-    percent = Math.max(10, percent);
-    percent = Math.min(70, percent);
-    return percent;
+  private Result createSuccessResult(
+    String dest,
+    String version,
+    String sessionKey,
+    String checksum,
+    boolean isManifest
+  ) {
+    Data output = new Data.Builder()
+      .putString(FILEDEST, dest)
+      .putString(VERSION, version)
+      .putString(SESSIONKEY, sessionKey)
+      .putString(CHECKSUM, checksum)
+      .putBoolean(IS_MANIFEST, isManifest)
+      .build();
+    return Result.success(output);
   }
 
+  @NonNull
   @Override
-  protected void onHandleIntent(Intent intent) {
+  public Result doWork() {
     try {
-      wakeLock.acquire(3 * 60 * 1000L);
-      assert intent != null;
-      String url = intent.getStringExtra(URL);
-      String id = intent.getStringExtra(ID);
-      String documentsDir = intent.getStringExtra(DOCDIR);
-      String dest = intent.getStringExtra(FILEDEST);
-      String version = intent.getStringExtra(VERSION);
-      String sessionKey = intent.getStringExtra(SESSIONKEY);
-      String checksum = intent.getStringExtra(CHECKSUM);
-      boolean isManifest = intent.getBooleanExtra(IS_MANIFEST, false);
-
-      Log.d(
-        TAG + " DownloadService",
-        "onHandleIntent isManifest: " + isManifest
-      );
+      String url = getInputData().getString(URL);
+      String id = getInputData().getString(ID);
+      String documentsDir = getInputData().getString(DOCDIR);
+      String dest = getInputData().getString(FILEDEST);
+      String version = getInputData().getString(VERSION);
+      String sessionKey = getInputData().getString(SESSIONKEY);
+      String checksum = getInputData().getString(CHECKSUM);
+      boolean isManifest = getInputData().getBoolean(IS_MANIFEST, false);
+
+      Log.d(TAG, "doWork isManifest: " + isManifest);
+
       if (isManifest) {
         JSONArray manifest = DataManager.getInstance().getAndClearManifest();
         if (manifest != null) {
@@ -118,17 +115,10 @@ public class DownloadService extends IntentService {
             sessionKey,
             manifest.toString()
           );
+          return createSuccessResult(dest, version, sessionKey, checksum, true);
         } else {
-          Log.e(TAG + " DownloadService", "Manifest is null");
-          publishResults(
-            "",
-            id,
-            version,
-            checksum,
-            sessionKey,
-            "Manifest is null",
-            false
-          );
+          Log.e(TAG, "Manifest is null");
+          return createFailureResult("Manifest is null");
         }
       } else {
         handleSingleFileDownload(
@@ -140,12 +130,24 @@ public class DownloadService extends IntentService {
           sessionKey,
           checksum
         );
+        return createSuccessResult(dest, version, sessionKey, checksum, false);
       }
-    } finally {
-      wakeLock.release();
+    } catch (Exception e) {
+      Log.e(TAG, "Error in doWork", e);
+      return createFailureResult(e.getMessage());
     }
   }
 
+  private int calcTotalPercent(long downloadedBytes, long contentLength) {
+    if (contentLength <= 0) {
+      return 0;
+    }
+    int percent = (int) (((double) downloadedBytes / contentLength) * 100);
+    percent = Math.max(10, percent);
+    percent = Math.min(70, percent);
+    return percent;
+  }
+
   private void handleManifestDownload(
     String id,
     String documentsDir,
@@ -155,7 +157,7 @@ public class DownloadService extends IntentService {
     String manifestString
   ) {
     try {
-      Log.d(TAG + " DownloadService", "handleManifestDownload");
+      Log.d(TAG, "handleManifestDownload");
       JSONArray manifest = new JSONArray(manifestString);
       File destFolder = new File(documentsDir, dest);
       File cacheFolder = new File(
@@ -204,7 +206,7 @@ public class DownloadService extends IntentService {
 
         // Ensure parent directories of the target file exist
         if (
-          !targetFile.getParentFile().exists() &&
+          !Objects.requireNonNull(targetFile.getParentFile()).exists() &&
           !targetFile.getParentFile().mkdirs()
         ) {
           throw new IOException(
@@ -217,12 +219,12 @@ public class DownloadService extends IntentService {
           try {
             if (builtinFile.exists() && verifyChecksum(builtinFile, fileHash)) {
               copyFile(builtinFile, targetFile);
-              Log.d(TAG + " DownloadService", "using builtin file " + fileName);
+              Log.d(TAG, "using builtin file " + fileName);
             } else if (
               cacheFile.exists() && verifyChecksum(cacheFile, fileHash)
             ) {
               copyFile(cacheFile, targetFile);
-              Log.d(TAG + " DownloadService", "already cached " + fileName);
+              Log.d(TAG, "already cached " + fileName);
             } else {
               downloadAndVerify(
                 downloadUrl,
@@ -235,13 +237,9 @@ public class DownloadService extends IntentService {
 
             long completed = completedFiles.incrementAndGet();
             int percent = calcTotalPercent(completed, totalFiles);
-            notifyDownload(id, percent);
+            setProgress(percent);
           } catch (Exception e) {
-            Log.e(
-              TAG + " DownloadService",
-              "Error processing file: " + fileName,
-              e
-            );
+            Log.e(TAG, "Error processing file: " + fileName, e);
             hasError.set(true);
           }
         });
@@ -253,7 +251,7 @@ public class DownloadService extends IntentService {
         try {
           future.get();
         } catch (Exception e) {
-          Log.e(TAG + " DownloadService", "Error waiting for download", e);
+          Log.e(TAG, "Error waiting for download", e);
           hasError.set(true);
         }
       }
@@ -271,11 +269,8 @@ public class DownloadService extends IntentService {
       if (hasError.get()) {
         throw new IOException("One or more files failed to download");
       }
-
-      publishResults(dest, id, version, "", sessionKey, "", true);
     } catch (Exception e) {
-      Log.e(TAG + " DownloadService", "Error in handleManifestDownload", e);
-      publishResults("", id, version, "", sessionKey, e.getMessage(), true);
+      Log.e(TAG, "Error in handleManifestDownload", e);
     }
   }
 
@@ -308,14 +303,12 @@ public class DownloadService extends IntentService {
             String updateVersion = reader.readLine();
             if (!updateVersion.equals(version)) {
               clearDownloadData(documentsDir);
-              downloadedBytes = 0;
             } else {
               downloadedBytes = tempFile.length();
             }
           }
         } else {
           clearDownloadData(documentsDir);
-          downloadedBytes = 0;
         }
 
         if (downloadedBytes > 0) {
@@ -331,7 +324,6 @@ public class DownloadService extends IntentService {
           responseCode == HttpURLConnection.HTTP_OK ||
           responseCode == HttpURLConnection.HTTP_PARTIAL
         ) {
-          String contentType = httpConn.getContentType();
           long contentLength = httpConn.getContentLength() + downloadedBytes;
 
           try (
@@ -375,7 +367,7 @@ public class DownloadService extends IntentService {
                 lastNotifiedPercent += 10;
                 // Artificial delay using CPU-bound calculation to take ~5 seconds
                 double result = 0;
-                notifyDownload(id, lastNotifiedPercent);
+                setProgress(lastNotifiedPercent);
               }
             }
 
@@ -385,7 +377,6 @@ public class DownloadService extends IntentService {
             // Rename the temp file with the final name (dest)
             tempFile.renameTo(new File(documentsDir, dest));
             infoFile.delete();
-            publishResults(dest, id, version, checksum, sessionKey, "", false);
           }
         } else {
           infoFile.delete();
@@ -397,26 +388,10 @@ public class DownloadService extends IntentService {
       }
     } catch (OutOfMemoryError e) {
       e.printStackTrace();
-      publishResults(
-        "",
-        id,
-        version,
-        checksum,
-        sessionKey,
-        "low_mem_fail",
-        false
-      );
+      throw new RuntimeException("low_mem_fail");
     } catch (Exception e) {
       e.printStackTrace();
-      publishResults(
-        "",
-        id,
-        version,
-        checksum,
-        sessionKey,
-        e.getLocalizedMessage(),
-        false
-      );
+      throw new RuntimeException(e.getLocalizedMessage());
     }
   }
 
@@ -433,37 +408,6 @@ public class DownloadService extends IntentService {
     }
   }
 
-  private void notifyDownload(String id, int percent) {
-    Intent intent = new Intent(PERCENTDOWNLOAD);
-    intent.setPackage(getPackageName());
-    intent.putExtra(ID, id);
-    intent.putExtra(PERCENT, percent);
-    sendBroadcast(intent);
-  }
-
-  private void publishResults(
-    String dest,
-    String id,
-    String version,
-    String checksum,
-    String sessionKey,
-    String error,
-    boolean isManifest
-  ) {
-    Intent intent = new Intent(NOTIFICATION);
-    intent.setPackage(getPackageName());
-    if (dest != null && !dest.isEmpty()) {
-      intent.putExtra(FILEDEST, dest);
-    }
-    intent.putExtra(ERROR, error);
-    intent.putExtra(ID, id);
-    intent.putExtra(VERSION, version);
-    intent.putExtra(SESSIONKEY, sessionKey);
-    intent.putExtra(CHECKSUM, checksum);
-    intent.putExtra(IS_MANIFEST, isManifest);
-    sendBroadcast(intent);
-  }
-
   // Helper methods
 
   private void copyFile(File source, File dest) throws IOException {
@@ -484,7 +428,7 @@ public class DownloadService extends IntentService {
     String expectedHash,
     String id
   ) throws Exception {
-    Log.d(TAG + " DownloadService", "downloadAndVerify " + downloadUrl);
+    Log.d(TAG, "downloadAndVerify " + downloadUrl);
 
     Request request = new Request.Builder().url(downloadUrl).build();
 

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

@@ -0,0 +1,111 @@
+package ee.forgr.capacitor_updater;
+
+import android.content.Context;
+import android.util.Log;
+import androidx.work.BackoffPolicy;
+import androidx.work.Configuration;
+import androidx.work.Constraints;
+import androidx.work.Data;
+import androidx.work.NetworkType;
+import androidx.work.OneTimeWorkRequest;
+import androidx.work.WorkManager;
+import androidx.work.WorkRequest;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+public class DownloadWorkerManager {
+
+  private static final String TAG = "DownloadWorkerManager";
+  private static volatile boolean isInitialized = false;
+  private static final Set<String> activeVersions = new HashSet<>();
+
+  private static synchronized void initializeIfNeeded(Context context) {
+    if (!isInitialized) {
+      try {
+        Configuration config = new Configuration.Builder()
+          .setMinimumLoggingLevel(android.util.Log.INFO)
+          .build();
+        WorkManager.initialize(context, config);
+        isInitialized = true;
+      } catch (IllegalStateException e) {
+        // WorkManager was already initialized, ignore
+      }
+    }
+  }
+
+  public static synchronized boolean isVersionDownloading(String version) {
+    return activeVersions.contains(version);
+  }
+
+  public static void enqueueDownload(
+    Context context,
+    String url,
+    String id,
+    String documentsDir,
+    String dest,
+    String version,
+    String sessionKey,
+    String checksum,
+    boolean isManifest
+  ) {
+    initializeIfNeeded(context.getApplicationContext());
+
+    // If version is already downloading, don't start another one
+    if (isVersionDownloading(version)) {
+      Log.i(TAG, "Version " + version + " is already downloading");
+      return;
+    }
+    activeVersions.add(version);
+
+    // Create input data
+    Data inputData = new Data.Builder()
+      .putString(DownloadService.URL, url)
+      .putString(DownloadService.ID, id)
+      .putString(DownloadService.DOCDIR, documentsDir)
+      .putString(DownloadService.FILEDEST, dest)
+      .putString(DownloadService.VERSION, version)
+      .putString(DownloadService.SESSIONKEY, sessionKey)
+      .putString(DownloadService.CHECKSUM, checksum)
+      .putBoolean(DownloadService.IS_MANIFEST, isManifest)
+      .build();
+
+    // Create network constraints
+    Constraints constraints = new Constraints.Builder()
+      .setRequiredNetworkType(NetworkType.CONNECTED)
+      .build();
+
+    // Create work request with tags for tracking
+    OneTimeWorkRequest workRequest = new OneTimeWorkRequest.Builder(
+      DownloadService.class
+    )
+      .setConstraints(constraints)
+      .setInputData(inputData)
+      .addTag(id)
+      .addTag(version) // Add version tag for tracking
+      .addTag("capacitor_updater_download")
+      .setBackoffCriteria(
+        BackoffPolicy.LINEAR,
+        WorkRequest.MIN_BACKOFF_MILLIS,
+        TimeUnit.MILLISECONDS
+      )
+      .build();
+
+    // Enqueue work
+    WorkManager.getInstance(context).enqueue(workRequest);
+  }
+
+  public static void cancelVersionDownload(Context context, String version) {
+    initializeIfNeeded(context.getApplicationContext());
+    WorkManager.getInstance(context).cancelAllWorkByTag(version);
+    activeVersions.remove(version);
+  }
+
+  public static void cancelAllDownloads(Context context) {
+    initializeIfNeeded(context.getApplicationContext());
+    WorkManager.getInstance(context).cancelAllWorkByTag(
+      "capacitor_updater_download"
+    );
+    activeVersions.clear();
+  }
+}

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.7-alpha.2"
+    private let PLUGIN_VERSION: String = "6.7.7-alpha.3"
     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.7-alpha.2",
+  "version": "6.7.7-alpha.3",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",