@capgo/capacitor-updater 4.13.7 → 4.14.1

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ee.forgr.capacitor_updater">
+    <application>
+        <service android:name="ee.forgr.capacitor_updater.DownloadService" />
+    </application>
 </manifest>

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

@@ -1,7 +1,13 @@
 package ee.forgr.capacitor_updater;
 
+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 com.android.volley.BuildConfig;
@@ -54,7 +60,7 @@ public class CapacitorUpdater {
   private static final String bundleDirectory = "versions";
 
   public static final String TAG = "Capacitor-updater";
-  public static final String pluginVersion = "4.13.7";
+  public static final String pluginVersion = "4.14.1";
 
   public SharedPreferences.Editor editor;
   public SharedPreferences prefs;
@@ -62,6 +68,7 @@ public class CapacitorUpdater {
   public RequestQueue requestQueue;
 
   public File documentsDir;
+  public Activity activity;
   public String versionBuild = "";
   public String versionCode = "";
   public String versionOs = "";
@@ -125,6 +132,10 @@ public class CapacitorUpdater {
     return;
   }
 
+  void notifyListeners(final String id, final JSObject res) {
+    return;
+  }
+
   private String randomString(final int len) {
     final StringBuilder sb = new StringBuilder(len);
     for (int i = 0; i < len; i++) sb.append(
@@ -224,6 +235,135 @@ public class CapacitorUpdater {
     sourceFile.delete();
   }
 
+  public void onResume() {
+    this.activity.registerReceiver(
+        receiver,
+        new IntentFilter(DownloadService.NOTIFICATION)
+      );
+  }
+
+  public void onPause() {
+    this.activity.unregisterReceiver(receiver);
+  }
+
+  private BroadcastReceiver receiver = new BroadcastReceiver() {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      String action = intent.getAction();
+      Bundle bundle = intent.getExtras();
+      if (bundle != null) {
+        if (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) {
+          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);
+          Log.i(
+            CapacitorUpdater.TAG,
+            "res " +
+            id +
+            " " +
+            dest +
+            " " +
+            version +
+            " " +
+            sessionKey +
+            " " +
+            checksum
+          );
+          CapacitorUpdater.this.finishBackground(
+              id,
+              dest,
+              version,
+              sessionKey,
+              checksum
+            );
+        } else {
+          Log.i(TAG, "Unknown action " + action);
+        }
+      }
+    }
+  };
+
+  public void finishBackground(
+    String id,
+    String dest,
+    String version,
+    String sessionKey,
+    String checksumRes
+  ) {
+    try {
+      final File downloaded = new File(this.documentsDir, dest);
+      this.decryptFile(downloaded, sessionKey);
+      final String checksum;
+      checksum = this.getChecksum(downloaded);
+
+      this.notifyDownload(id, 71);
+      final File unzipped = this.unzip(id, downloaded, this.randomString(10));
+      downloaded.delete();
+      this.notifyDownload(id, 91);
+      final String idName = bundleDirectory + "/" + id;
+      this.flattenAssets(unzipped, idName);
+      this.notifyDownload(id, 100);
+      this.saveBundleInfo(id, null);
+      BundleInfo info = new BundleInfo(
+        id,
+        version,
+        BundleStatus.PENDING,
+        new Date(System.currentTimeMillis()),
+        checksum
+      );
+      this.saveBundleInfo(id, info);
+      if (!checksumRes.equals("") && !checksumRes.equals(checksum)) {
+        Log.e(
+          CapacitorUpdater.TAG,
+          "Error checksum " + info.getChecksum() + " " + checksum
+        );
+        this.sendStats("checksum_fail", getCurrentBundle().getVersionName());
+        final Boolean res = this.delete(info.getId());
+        if (res) {
+          Log.i(
+            CapacitorUpdater.TAG,
+            "Failed bundle deleted: " + info.getVersionName()
+          );
+        }
+        return;
+      }
+      final JSObject ret = new JSObject();
+      ret.put("bundle", info.toJSON());
+      CapacitorUpdater.this.notifyListeners("updateAvailable", ret);
+      this.setNextBundle(info.getId());
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+  }
+
+  private void downloadFileBackground(
+    final String id,
+    final String url,
+    final String version,
+    final String sessionKey,
+    final String checksum,
+    final String dest
+  ) {
+    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);
+    this.activity.startService(intent);
+  }
+
   private File downloadFile(
     final String id,
     final String url,
@@ -325,6 +465,35 @@ public class CapacitorUpdater {
     }
   }
 
+  public void downloadBackground(
+    final String url,
+    final String version,
+    final String sessionKey,
+    final String checksum
+  ) {
+    final String id = this.randomString(10);
+    this.saveBundleInfo(
+        id,
+        new BundleInfo(
+          id,
+          version,
+          BundleStatus.DOWNLOADING,
+          new Date(System.currentTimeMillis()),
+          ""
+        )
+      );
+    this.notifyDownload(id, 0);
+    this.notifyDownload(id, 5);
+    this.downloadFileBackground(
+        id,
+        url,
+        version,
+        sessionKey,
+        checksum,
+        this.randomString(10)
+      );
+  }
+
   public BundleInfo download(
     final String url,
     final String version,

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

@@ -81,11 +81,17 @@ public class CapacitorUpdaterPlugin
           public void notifyDownload(final String id, final int percent) {
             CapacitorUpdaterPlugin.this.notifyDownload(id, percent);
           }
+
+          @Override
+          public void notifyListeners(final String id, final JSObject res) {
+            CapacitorUpdaterPlugin.this.notifyListeners(id, res);
+          }
         };
       final PackageInfo pInfo =
         this.getContext()
           .getPackageManager()
           .getPackageInfo(this.getContext().getPackageName(), 0);
+      this.implementation.activity = this.getActivity();
       this.implementation.versionBuild = pInfo.versionName;
       this.implementation.versionCode = Integer.toString(pInfo.versionCode);
       this.implementation.requestQueue =
@@ -803,245 +809,191 @@ public class CapacitorUpdaterPlugin
     }
   }
 
-  @Override // appMovedToForeground
-  public void onActivityStarted(@NonNull final Activity activity) {
-    if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled()) {
-      new Thread(
-        new Runnable() {
-          @Override
-          public void run() {
-            Log.i(
-              CapacitorUpdater.TAG,
-              "Check for update via: " + CapacitorUpdaterPlugin.this.updateUrl
-            );
-            CapacitorUpdaterPlugin.this.implementation.getLatest(
-                CapacitorUpdaterPlugin.this.updateUrl,
-                res -> {
-                  final BundleInfo current =
-                    CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
-                  try {
-                    if (res.has("message")) {
-                      Log.i(
-                        CapacitorUpdater.TAG,
-                        "message " + res.get("message")
-                      );
-                      if (
-                        res.has("major") &&
-                        res.getBoolean("major") &&
-                        res.has("version")
-                      ) {
-                        final JSObject majorAvailable = new JSObject();
-                        majorAvailable.put("version", res.getString("version"));
-                        CapacitorUpdaterPlugin.this.notifyListeners(
-                            "majorAvailable",
-                            majorAvailable
-                          );
-                      }
-                      final JSObject retNoNeed = new JSObject();
-                      retNoNeed.put("bundle", current.toJSON());
-                      CapacitorUpdaterPlugin.this.notifyListeners(
-                          "noNeedUpdate",
-                          retNoNeed
-                        );
-                      return;
-                    }
-
+  private void backgroundDownload() {
+    new Thread(
+      new Runnable() {
+        @Override
+        public void run() {
+          Log.i(
+            CapacitorUpdater.TAG,
+            "Check for update via: " + CapacitorUpdaterPlugin.this.updateUrl
+          );
+          CapacitorUpdaterPlugin.this.implementation.getLatest(
+              CapacitorUpdaterPlugin.this.updateUrl,
+              res -> {
+                final BundleInfo current =
+                  CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
+                try {
+                  if (res.has("message")) {
+                    Log.i(
+                      CapacitorUpdater.TAG,
+                      "message " + res.get("message")
+                    );
                     if (
-                      !res.has("url") ||
-                      !CapacitorUpdaterPlugin.this.isValidURL(
-                          res.getString("url")
-                        )
+                      res.has("major") &&
+                      res.getBoolean("major") &&
+                      res.has("version")
                     ) {
-                      Log.e(
-                        CapacitorUpdater.TAG,
-                        "Error no url or wrong format"
-                      );
-                      final JSObject retNoNeed = new JSObject();
-                      retNoNeed.put("bundle", current.toJSON());
+                      final JSObject majorAvailable = new JSObject();
+                      majorAvailable.put("version", res.getString("version"));
                       CapacitorUpdaterPlugin.this.notifyListeners(
-                          "noNeedUpdate",
-                          retNoNeed
+                          "majorAvailable",
+                          majorAvailable
                         );
                     }
-                    final String latestVersionName = res.getString("version");
+                    final JSObject retNoNeed = new JSObject();
+                    retNoNeed.put("bundle", current.toJSON());
+                    CapacitorUpdaterPlugin.this.notifyListeners(
+                        "noNeedUpdate",
+                        retNoNeed
+                      );
+                    return;
+                  }
 
-                    if (
-                      latestVersionName != null &&
-                      !"".equals(latestVersionName) &&
-                      !current.getVersionName().equals(latestVersionName)
-                    ) {
-                      final BundleInfo latest =
-                        CapacitorUpdaterPlugin.this.implementation.getBundleInfoByName(
-                            latestVersionName
+                  if (
+                    !res.has("url") ||
+                    !CapacitorUpdaterPlugin.this.isValidURL(
+                        res.getString("url")
+                      )
+                  ) {
+                    Log.e(CapacitorUpdater.TAG, "Error no url or wrong format");
+                    final JSObject retNoNeed = new JSObject();
+                    retNoNeed.put("bundle", current.toJSON());
+                    CapacitorUpdaterPlugin.this.notifyListeners(
+                        "noNeedUpdate",
+                        retNoNeed
+                      );
+                  }
+                  final String latestVersionName = res.getString("version");
+
+                  if (
+                    latestVersionName != null &&
+                    !"".equals(latestVersionName) &&
+                    !current.getVersionName().equals(latestVersionName)
+                  ) {
+                    final BundleInfo latest =
+                      CapacitorUpdaterPlugin.this.implementation.getBundleInfoByName(
+                          latestVersionName
+                        );
+                    if (latest != null) {
+                      if (latest.isErrorStatus()) {
+                        Log.e(
+                          CapacitorUpdater.TAG,
+                          "Latest bundle already exists, and is in error state. Aborting update."
+                        );
+                        final JSObject retNoNeed = new JSObject();
+                        retNoNeed.put("bundle", current.toJSON());
+                        CapacitorUpdaterPlugin.this.notifyListeners(
+                            "noNeedUpdate",
+                            retNoNeed
                           );
-                      if (latest != null) {
-                        if (latest.isErrorStatus()) {
-                          Log.e(
-                            CapacitorUpdater.TAG,
-                            "Latest bundle already exists, and is in error state. Aborting update."
+                        return;
+                      }
+                      if (latest.isDownloaded()) {
+                        Log.i(
+                          CapacitorUpdater.TAG,
+                          "Latest bundle already exists and download is NOT required. Update will occur next time app moves to background."
+                        );
+                        final JSObject ret = new JSObject();
+                        ret.put("bundle", latest.toJSON());
+                        CapacitorUpdaterPlugin.this.notifyListeners(
+                            "updateAvailable",
+                            ret
                           );
-                          final JSObject retNoNeed = new JSObject();
-                          retNoNeed.put("bundle", current.toJSON());
-                          CapacitorUpdaterPlugin.this.notifyListeners(
-                              "noNeedUpdate",
-                              retNoNeed
-                            );
-                          return;
-                        }
-                        if (latest.isDownloaded()) {
-                          Log.i(
-                            CapacitorUpdater.TAG,
-                            "Latest bundle already exists and download is NOT required. Update will occur next time app moves to background."
+                        CapacitorUpdaterPlugin.this.implementation.setNextBundle(
+                            latest.getId()
                           );
-                          final JSObject ret = new JSObject();
-                          ret.put("bundle", latest.toJSON());
-                          CapacitorUpdaterPlugin.this.notifyListeners(
-                              "updateAvailable",
-                              ret
-                            );
-                          CapacitorUpdaterPlugin.this.implementation.setNextBundle(
-                              latest.getId()
+                        return;
+                      }
+                      if (latest.isDeleted()) {
+                        Log.i(
+                          CapacitorUpdater.TAG,
+                          "Latest bundle already exists and will be deleted, download will overwrite it."
+                        );
+                        try {
+                          final Boolean deleted =
+                            CapacitorUpdaterPlugin.this.implementation.delete(
+                                latest.getId(),
+                                true
+                              );
+                          if (deleted) {
+                            Log.i(
+                              CapacitorUpdater.TAG,
+                              "Failed bundle deleted: " +
+                              latest.getVersionName()
                             );
-                          return;
-                        }
-                        if (latest.isDeleted()) {
-                          Log.i(
+                          }
+                        } catch (final IOException e) {
+                          Log.e(
                             CapacitorUpdater.TAG,
-                            "Latest bundle already exists and will be deleted, download will overwrite it."
+                            "Failed to delete failed bundle: " +
+                            latest.getVersionName(),
+                            e
                           );
+                        }
+                      }
+                    }
+
+                    new Thread(
+                      new Runnable() {
+                        @Override
+                        public void run() {
                           try {
-                            final Boolean deleted =
-                              CapacitorUpdaterPlugin.this.implementation.delete(
-                                  latest.getId(),
-                                  true
-                                );
-                            if (deleted) {
-                              Log.i(
-                                CapacitorUpdater.TAG,
-                                "Failed bundle deleted: " +
-                                latest.getVersionName()
+                            Log.i(
+                              CapacitorUpdater.TAG,
+                              "New bundle: " +
+                              latestVersionName +
+                              " found. Current is: " +
+                              current.getVersionName() +
+                              ". Update will occur next time app moves to background."
+                            );
+
+                            final String url = res.getString("url");
+                            final String session_key = res.has("session_key")
+                              ? res.getString("session_key")
+                              : "";
+                            CapacitorUpdaterPlugin.this.implementation.downloadBackground(
+                                url,
+                                latestVersionName,
+                                session_key,
+                                res.getString("checksum")
                               );
-                            }
-                          } catch (final IOException e) {
+                          } catch (final Exception e) {
                             Log.e(
                               CapacitorUpdater.TAG,
-                              "Failed to delete failed bundle: " +
-                              latest.getVersionName(),
+                              "error downloading file",
                               e
                             );
-                          }
-                        }
-                      }
-
-                      new Thread(
-                        new Runnable() {
-                          @Override
-                          public void run() {
-                            try {
-                              Log.i(
-                                CapacitorUpdater.TAG,
-                                "New bundle: " +
-                                latestVersionName +
-                                " found. Current is: " +
-                                current.getVersionName() +
-                                ". Update will occur next time app moves to background."
+                            final JSObject ret = new JSObject();
+                            ret.put("version", latestVersionName);
+                            CapacitorUpdaterPlugin.this.notifyListeners(
+                                "downloadFailed",
+                                ret
                               );
-
-                              final String url = res.getString("url");
-                              final String session_key = res.has("session_key")
-                                ? res.getString("session_key")
-                                : "";
-                              final BundleInfo next =
-                                CapacitorUpdaterPlugin.this.implementation.download(
-                                    url,
-                                    latestVersionName,
-                                    session_key
-                                  );
-                              final String checksum = res.has("checksum")
-                                ? res.getString("checksum")
-                                : "";
-                              if (
-                                !checksum.equals("") &&
-                                !next.getChecksum().equals(checksum)
-                              ) {
-                                Log.e(
-                                  CapacitorUpdater.TAG,
-                                  "Error checksum " +
-                                  next.getChecksum() +
-                                  " " +
-                                  checksum
-                                );
-                                CapacitorUpdaterPlugin.this.implementation.sendStats(
-                                    "checksum_fail",
-                                    current.getVersionName()
-                                  );
-                                final Boolean res =
-                                  CapacitorUpdaterPlugin.this.implementation.delete(
-                                      next.getId()
-                                    );
-                                if (res) {
-                                  Log.i(
-                                    CapacitorUpdater.TAG,
-                                    "Failed bundle deleted: " +
-                                    next.getVersionName()
-                                  );
-                                }
-                                return;
-                              }
-                              final JSObject ret = new JSObject();
-                              ret.put("bundle", next.toJSON());
-                              CapacitorUpdaterPlugin.this.notifyListeners(
-                                  "updateAvailable",
-                                  ret
-                                );
-                              CapacitorUpdaterPlugin.this.implementation.setNextBundle(
-                                  next.getId()
-                                );
-                            } catch (final Exception e) {
-                              Log.e(
-                                CapacitorUpdater.TAG,
-                                "error downloading file",
-                                e
+                            final BundleInfo current =
+                              CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
+                            CapacitorUpdaterPlugin.this.implementation.sendStats(
+                                "download_fail",
+                                current.getVersionName()
+                              );
+                            final JSObject retNoNeed = new JSObject();
+                            retNoNeed.put("bundle", current.toJSON());
+                            CapacitorUpdaterPlugin.this.notifyListeners(
+                                "noNeedUpdate",
+                                retNoNeed
                               );
-                              final JSObject ret = new JSObject();
-                              ret.put("version", latestVersionName);
-                              CapacitorUpdaterPlugin.this.notifyListeners(
-                                  "downloadFailed",
-                                  ret
-                                );
-                              final BundleInfo current =
-                                CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
-                              CapacitorUpdaterPlugin.this.implementation.sendStats(
-                                  "download_fail",
-                                  current.getVersionName()
-                                );
-                              final JSObject retNoNeed = new JSObject();
-                              retNoNeed.put("bundle", current.toJSON());
-                              CapacitorUpdaterPlugin.this.notifyListeners(
-                                  "noNeedUpdate",
-                                  retNoNeed
-                                );
-                            }
                           }
                         }
-                      )
-                        .start();
-                    } else {
-                      Log.i(
-                        CapacitorUpdater.TAG,
-                        "No need to update, " +
-                        current.getId() +
-                        " is the latest bundle."
-                      );
-                      final JSObject retNoNeed = new JSObject();
-                      retNoNeed.put("bundle", current.toJSON());
-                      CapacitorUpdaterPlugin.this.notifyListeners(
-                          "noNeedUpdate",
-                          retNoNeed
-                        );
-                    }
-                  } catch (final JSONException e) {
-                    Log.e(CapacitorUpdater.TAG, "error parsing JSON", e);
+                      }
+                    )
+                      .start();
+                  } else {
+                    Log.i(
+                      CapacitorUpdater.TAG,
+                      "No need to update, " +
+                      current.getId() +
+                      " is the latest bundle."
+                    );
                     final JSObject retNoNeed = new JSObject();
                     retNoNeed.put("bundle", current.toJSON());
                     CapacitorUpdaterPlugin.this.notifyListeners(
@@ -1049,14 +1001,28 @@ public class CapacitorUpdaterPlugin
                         retNoNeed
                       );
                   }
+                } catch (final JSONException e) {
+                  Log.e(CapacitorUpdater.TAG, "error parsing JSON", e);
+                  final JSObject retNoNeed = new JSObject();
+                  retNoNeed.put("bundle", current.toJSON());
+                  CapacitorUpdaterPlugin.this.notifyListeners(
+                      "noNeedUpdate",
+                      retNoNeed
+                    );
                 }
-              );
-          }
+              }
+            );
         }
-      )
-        .start();
-    }
+      }
+    )
+      .start();
+  }
 
+  @Override // appMovedToForeground
+  public void onActivityStarted(@NonNull final Activity activity) {
+    if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled()) {
+      this.backgroundDownload();
+    }
     this.checkAppReady();
   }
 
@@ -1246,23 +1212,34 @@ public class CapacitorUpdaterPlugin
     if (backgroundTask != null && taskRunning) {
       backgroundTask.interrupt();
     }
+    this.implementation.activity = activity;
+    this.implementation.onResume();
   }
 
   @Override
-  public void onActivityPaused(@NonNull final Activity activity) {}
+  public void onActivityPaused(@NonNull final Activity activity) {
+    this.implementation.activity = activity;
+    this.implementation.onPause();
+  }
 
   @Override
   public void onActivityCreated(
     @NonNull final Activity activity,
     @Nullable final Bundle savedInstanceState
-  ) {}
+  ) {
+    this.implementation.activity = activity;
+  }
 
   @Override
   public void onActivitySaveInstanceState(
     @NonNull final Activity activity,
     @NonNull final Bundle outState
-  ) {}
+  ) {
+    this.implementation.activity = activity;
+  }
 
   @Override
-  public void onActivityDestroyed(@NonNull final Activity activity) {}
+  public void onActivityDestroyed(@NonNull final Activity activity) {
+    this.implementation.activity = activity;
+  }
 }

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

@@ -0,0 +1,120 @@
+package ee.forgr.capacitor_updater;
+
+import android.app.IntentService;
+import android.content.Intent;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+
+public class DownloadService extends IntentService {
+
+  public static final String URL = "URL";
+  public static final String ID = "id";
+  public static final String PERCENT = "percent";
+  public static final String FILEDEST = "filendest";
+  public static final String DOCDIR = "docdir";
+  public static final String ERROR = "error";
+  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 DownloadService() {
+    super("Background DownloadService");
+  }
+
+  private int calcTotalPercent(
+    final int percent,
+    final int min,
+    final int max
+  ) {
+    return (percent * (max - min)) / 100 + min;
+  }
+
+  // Will be called asynchronously by OS.
+  @Override
+  protected void onHandleIntent(Intent intent) {
+    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);
+
+    try {
+      final URL u = new URL(url);
+      final URLConnection connection = u.openConnection();
+      final InputStream is = u.openStream();
+      final DataInputStream dis = new DataInputStream(is);
+
+      final File target = new File(documentsDir, dest);
+      target.getParentFile().mkdirs();
+      target.createNewFile();
+      final FileOutputStream fos = new FileOutputStream(target);
+
+      final long totalLength = connection.getContentLength();
+      final int bufferSize = 1024;
+      final byte[] buffer = new byte[bufferSize];
+      int length;
+
+      int bytesRead = bufferSize;
+      int percent = 0;
+      this.notifyDownload(id, 10);
+      while ((length = dis.read(buffer)) > 0) {
+        fos.write(buffer, 0, length);
+        final int newPercent = (int) ((bytesRead * 100) / totalLength);
+        if (totalLength > 1 && newPercent != percent) {
+          percent = newPercent;
+          this.notifyDownload(id, this.calcTotalPercent(percent, 10, 70));
+        }
+        bytesRead += length;
+      }
+      publishResults(dest, id, version, checksum, sessionKey, "");
+    } catch (Exception e) {
+      e.printStackTrace();
+      publishResults(
+        "",
+        id,
+        version,
+        checksum,
+        sessionKey,
+        e.getLocalizedMessage()
+      );
+    }
+  }
+
+  private void notifyDownload(String id, int percent) {
+    Intent intent = new Intent(PERCENTDOWNLOAD);
+    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
+  ) {
+    Intent intent = new Intent(NOTIFICATION);
+    if (!dest.equals("")) {
+      intent.putExtra(FILEDEST, dest);
+    }
+    if (!error.equals("")) {
+      intent.putExtra(ERROR, error);
+    }
+    intent.putExtra(ID, id);
+    intent.putExtra(VERSION, version);
+    intent.putExtra(SESSIONKEY, sessionKey);
+    intent.putExtra(CHECKSUM, checksum);
+    intent.putExtra(ERROR, error);
+    sendBroadcast(intent);
+  }
+}

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -466,101 +466,105 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         self.appReadyCheck = nil
     }
 
-    func EndBackGroundTask() {
+    func endBackGroundTask() {
         UIApplication.shared.endBackgroundTask(self.backgroundTaskID)
         self.backgroundTaskID = UIBackgroundTaskIdentifier.invalid
     }
-    @objc func appMovedToForeground() {
-        if backgroundWork != nil && taskRunning {
-            backgroundWork!.cancel()
-            print("\(self.implementation.TAG) Background Timer Task canceled, Activity resumed before timer completes")
-        }
-        if self._isAutoUpdateEnabled() {
-            DispatchQueue.global(qos: .background).async {
-                self.backgroundTaskID = UIApplication.shared.beginBackgroundTask(withName: "Finish Download Tasks") {
-                    // End the task if time expires.
-                    UIApplication.shared.endBackgroundTask(self.backgroundTaskID)
-                    self.backgroundTaskID = UIBackgroundTaskIdentifier.invalid
+
+    func backgroundDownload() {
+        DispatchQueue.global(qos: .background).async {
+            self.backgroundTaskID = UIApplication.shared.beginBackgroundTask(withName: "Finish Download Tasks") {
+                // End the task if time expires.
+                self.endBackGroundTask()
+            }
+            print("\(self.implementation.TAG) Check for update via \(self.updateUrl)")
+            let url = URL(string: self.updateUrl)!
+            let res = self.implementation.getLatest(url: url)
+            let current = self.implementation.getCurrentBundle()
+
+            if (res.message) != nil {
+                print("\(self.implementation.TAG) message \(res.message ?? "")")
+                if res.major == true {
+                    self.notifyListeners("majorAvailable", data: ["version": res.version])
                 }
-                print("\(self.implementation.TAG) Check for update via \(self.updateUrl)")
-                let url = URL(string: self.updateUrl)!
-                let res = self.implementation.getLatest(url: url)
-                let current = self.implementation.getCurrentBundle()
-
-                if (res.message) != nil {
-                    print("\(self.implementation.TAG) message \(res.message ?? "")")
-                    if res.major == true {
-                        self.notifyListeners("majorAvailable", data: ["version": res.version])
+                self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
+                self.endBackGroundTask()
+                return
+            }
+            let sessionKey = res.sessionKey ?? ""
+            guard let downloadUrl = URL(string: res.url) else {
+                print("\(self.implementation.TAG) Error no url or wrong format")
+                self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
+                self.endBackGroundTask()
+                return
+            }
+            let latestVersionName = res.version
+            if latestVersionName != "" && current.getVersionName() != latestVersionName {
+                let latest = self.implementation.getBundleInfoByVersionName(version: latestVersionName)
+                if latest != nil {
+                    if latest!.isErrorStatus() {
+                        print("\(self.implementation.TAG) Latest version already exists, and is in error state. Aborting update.")
+                        self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
+                        self.endBackGroundTask()
+                        return
                     }
-                    self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
-                    self.EndBackGroundTask()
-                    return
-                }
-                let sessionKey = res.sessionKey ?? ""
-                guard let downloadUrl = URL(string: res.url) else {
-                    print("\(self.implementation.TAG) Error no url or wrong format")
-                    self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
-                    self.EndBackGroundTask()
-                    return
-                }
-                let latestVersionName = res.version
-                if latestVersionName != "" && current.getVersionName() != latestVersionName {
-                    let latest = self.implementation.getBundleInfoByVersionName(version: latestVersionName)
-                    if latest != nil {
-                        if latest!.isErrorStatus() {
-                            print("\(self.implementation.TAG) Latest version already exists, and is in error state. Aborting update.")
-                            self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
-                            self.EndBackGroundTask()
-                            return
-                        }
-                        if latest!.isDownloaded() {
-                            print("\(self.implementation.TAG) Latest version already exists and download is NOT required. Update will occur next time app moves to background.")
-                            self.notifyListeners("updateAvailable", data: ["bundle": current.toJSON()])
-                            _ = self.implementation.setNextBundle(next: latest!.getId())
-                            self.EndBackGroundTask()
-                            return
-                        }
-                        if latest!.isDeleted() {
-                            print("\(self.implementation.TAG) Latest bundle already exists and will be deleted, download will overwrite it.")
-                            let res = self.implementation.delete(id: latest!.getId(), removeInfo: true)
-                            if !res {
-                                print("\(self.implementation.TAG) Delete version deleted: \(latest!.toString())")
-                            } else {
-                                print("\(self.implementation.TAG) Failed to delete failed bundle: \(latest!.toString())")
-                            }
+                    if latest!.isDownloaded() {
+                        print("\(self.implementation.TAG) Latest version already exists and download is NOT required. Update will occur next time app moves to background.")
+                        self.notifyListeners("updateAvailable", data: ["bundle": current.toJSON()])
+                        _ = self.implementation.setNextBundle(next: latest!.getId())
+                        self.endBackGroundTask()
+                        return
+                    }
+                    if latest!.isDeleted() {
+                        print("\(self.implementation.TAG) Latest bundle already exists and will be deleted, download will overwrite it.")
+                        let res = self.implementation.delete(id: latest!.getId(), removeInfo: true)
+                        if !res {
+                            print("\(self.implementation.TAG) Delete version deleted: \(latest!.toString())")
+                        } else {
+                            print("\(self.implementation.TAG) Failed to delete failed bundle: \(latest!.toString())")
                         }
                     }
+                }
 
-                    do {
-                        print("\(self.implementation.TAG) New bundle: \(latestVersionName) found. Current is: \(current.getVersionName()). Update will occur next time app moves to background.")
-                        let next = try self.implementation.download(url: downloadUrl, version: latestVersionName, sessionKey: sessionKey)
-                        if res.checksum != "" && next.getChecksum() != res.checksum {
-                            print("\(self.implementation.TAG) Error checksum", next.getChecksum(), res.checksum)
-                            self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
-                            let resDel = self.implementation.delete(id: next.getId())
-                            if !resDel {
-                                print("\(self.implementation.TAG) Delete failed, id \(next.getId()) doesn't exist")
-                            }
-                            self.EndBackGroundTask()
-                            return
+                do {
+                    print("\(self.implementation.TAG) New bundle: \(latestVersionName) found. Current is: \(current.getVersionName()). Update will occur next time app moves to background.")
+                    let next = try self.implementation.download(url: downloadUrl, version: latestVersionName, sessionKey: sessionKey)
+                    if res.checksum != "" && next.getChecksum() != res.checksum {
+                        print("\(self.implementation.TAG) Error checksum", next.getChecksum(), res.checksum)
+                        self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
+                        let resDel = self.implementation.delete(id: next.getId())
+                        if !resDel {
+                            print("\(self.implementation.TAG) Delete failed, id \(next.getId()) doesn't exist")
                         }
-                        self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
-                        _ = self.implementation.setNextBundle(next: next.getId())
-                    } catch {
-                        print("\(self.implementation.TAG) Error downloading file", error.localizedDescription)
-                        let current: BundleInfo = self.implementation.getCurrentBundle()
-                        self.implementation.sendStats(action: "download_fail", versionName: current.getVersionName())
-                        self.notifyListeners("downloadFailed", data: ["version": latestVersionName])
-                        self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
+                        self.endBackGroundTask()
+                        return
                     }
-                } else {
-                    print("\(self.implementation.TAG) No need to update, \(current.getId()) is the latest bundle.")
+                    self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
+                    _ = self.implementation.setNextBundle(next: next.getId())
+                } catch {
+                    print("\(self.implementation.TAG) Error downloading file", error.localizedDescription)
+                    let current: BundleInfo = self.implementation.getCurrentBundle()
+                    self.implementation.sendStats(action: "download_fail", versionName: current.getVersionName())
+                    self.notifyListeners("downloadFailed", data: ["version": latestVersionName])
                     self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
                 }
+            } else {
+                print("\(self.implementation.TAG) No need to update, \(current.getId()) is the latest bundle.")
+                self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
             }
+            self.endBackGroundTask()
+        }
+    }
+
+    @objc func appMovedToForeground() {
+        if backgroundWork != nil && taskRunning {
+            backgroundWork!.cancel()
+            print("\(self.implementation.TAG) Background Timer Task canceled, Activity resumed before timer completes")
+        }
+        if self._isAutoUpdateEnabled() {
+            self.backgroundDownload()
         }
         self.checkAppReady()
-        self.EndBackGroundTask()
     }
 
     @objc func appMovedToBackground() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.13.7",
+  "version": "4.14.1",
   "license": "LGPL-3.0-only",
   "description": "OTA update for capacitor apps",
   "main": "dist/plugin.cjs.js",