@capgo/capacitor-updater 4.13.8 → 4.14.2

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,14 +1,22 @@
 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;
+import com.android.volley.NetworkResponse;
 import com.android.volley.Request;
 import com.android.volley.RequestQueue;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.android.volley.toolbox.HttpHeaderParser;
 import com.android.volley.toolbox.JsonObjectRequest;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.plugin.WebView;
@@ -21,6 +29,7 @@ import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.GeneralSecurityException;
@@ -54,7 +63,7 @@ public class CapacitorUpdater {
   private static final String bundleDirectory = "versions";
 
   public static final String TAG = "Capacitor-updater";
-  public static final String pluginVersion = "4.13.8";
+  public static final String pluginVersion = "4.14.2";
 
   public SharedPreferences.Editor editor;
   public SharedPreferences prefs;
@@ -62,6 +71,7 @@ public class CapacitorUpdater {
   public RequestQueue requestQueue;
 
   public File documentsDir;
+  public Activity activity;
   public String versionBuild = "";
   public String versionCode = "";
   public String versionOs = "";
@@ -125,6 +135,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 +238,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 +468,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,
@@ -503,6 +675,29 @@ public class CapacitorUpdater {
     return json;
   }
 
+  private JSObject createError(String message, VolleyError error) {
+    NetworkResponse response = error.networkResponse;
+    final JSObject retError = new JSObject();
+    retError.put("error", "response_error");
+    if (response != null) {
+      try {
+        String json = new String(
+          response.data,
+          HttpHeaderParser.parseCharset(response.headers)
+        );
+        Log.e(TAG, message + ": " + json);
+        retError.put("message", message + ": " + json);
+      } catch (UnsupportedEncodingException e) {
+        Log.e(TAG, message + ": " + e.toString());
+        retError.put("message", message + ": " + e.toString());
+      }
+    } else {
+      Log.e(TAG, message + ": " + error.toString());
+      retError.put("message", message + ": " + error.toString());
+    }
+    return retError;
+  }
+
   public void getLatest(final String updateUrl, final Callback callback) {
     JSONObject json = null;
     try {
@@ -548,11 +743,9 @@ public class CapacitorUpdater {
       new Response.ErrorListener() {
         @Override
         public void onErrorResponse(VolleyError error) {
-          Log.e(TAG, "Error getting Latest" + error.toString());
-          final JSObject retError = new JSObject();
-          retError.put("message", "Cannot set info: " + error.toString());
-          retError.put("error", "response_error");
-          callback.callback(retError);
+          callback.callback(
+            CapacitorUpdater.this.createError("Error get latest", error)
+          );
         }
       }
     );
@@ -615,11 +808,9 @@ public class CapacitorUpdater {
       new Response.ErrorListener() {
         @Override
         public void onErrorResponse(VolleyError error) {
-          Log.e(TAG, "Error set channel: " + error.toString());
-          final JSObject retError = new JSObject();
-          retError.put("message", "Cannot set channel: " + error.toString());
-          retError.put("error", "response_error");
-          callback.callback(retError);
+          callback.callback(
+            CapacitorUpdater.this.createError("Error set channel", error)
+          );
         }
       }
     );
@@ -677,11 +868,9 @@ public class CapacitorUpdater {
       new Response.ErrorListener() {
         @Override
         public void onErrorResponse(VolleyError error) {
-          Log.e(TAG, "Error get channel: " + error.toString());
-          final JSObject retError = new JSObject();
-          retError.put("message", "Error get channel: " + error.toString());
-          retError.put("error", "response_error");
-          callback.callback(retError);
+          callback.callback(
+            CapacitorUpdater.this.createError("Error get channel", error)
+          );
         }
       }
     );
@@ -719,7 +908,7 @@ public class CapacitorUpdater {
       new Response.ErrorListener() {
         @Override
         public void onErrorResponse(VolleyError error) {
-          Log.e(TAG, "Error sending stats: " + error.toString());
+          CapacitorUpdater.this.createError("Error send stats", error);
         }
       }
     );

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 =
@@ -946,51 +952,11 @@ public class CapacitorUpdaterPlugin
                             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()
+                            CapacitorUpdaterPlugin.this.implementation.downloadBackground(
+                                url,
+                                latestVersionName,
+                                session_key,
+                                res.getString("checksum")
                               );
                           } catch (final Exception e) {
                             Log.e(
@@ -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/package.json

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