@capgo/capacitor-updater 6.0.0 → 6.0.1

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

@@ -6,6 +6,8 @@
 
 package ee.forgr.capacitor_updater;
 
+import static android.content.Context.RECEIVER_NOT_EXPORTED;
+
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -21,7 +23,6 @@ import com.android.volley.DefaultRetryPolicy;
 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;
@@ -46,6 +47,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.zip.CRC32;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -53,10 +55,6 @@ import javax.crypto.SecretKey;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-interface Callback {
-  void callback(JSObject jsoObject);
-}
-
 public class CapacitorUpdater {
 
   private static final String AB =
@@ -70,14 +68,13 @@ public class CapacitorUpdater {
   private static final String bundleDirectory = "versions";
 
   public static final String TAG = "Capacitor-updater";
-  public static final int timeout = 20000;
-
   public SharedPreferences.Editor editor;
   public SharedPreferences prefs;
 
   public RequestQueue requestQueue;
 
   public File documentsDir;
+  public Boolean directUpdate = false;
   public Activity activity;
   public String PLUGIN_VERSION = "";
   public String versionBuild = "";
@@ -87,20 +84,19 @@ public class CapacitorUpdater {
   public String customId = "";
   public String statsUrl = "";
   public String channelUrl = "";
+  public String defaultChannel = "";
   public String appId = "";
   public String privateKey = "";
   public String deviceID = "";
+  public int timeout = 20000;
 
-  private final FilenameFilter filter = new FilenameFilter() {
-    @Override
-    public boolean accept(final File f, final String name) {
-      // ignore directories generated by mac os x
-      return (
-        !name.startsWith("__MACOSX") &&
-        !name.startsWith(".") &&
-        !name.startsWith(".DS_Store")
-      );
-    }
+  private final FilenameFilter filter = (f, name) -> {
+    // ignore directories generated by mac os x
+    return (
+      !name.startsWith("__MACOSX") &&
+      !name.startsWith(".") &&
+      !name.startsWith(".DS_Store")
+    );
   };
 
   private boolean isProd() {
@@ -109,9 +105,8 @@ public class CapacitorUpdater {
 
   private boolean isEmulator() {
     return (
-      (
-        Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")
-      ) ||
+      (Build.BRAND.startsWith("generic") &&
+        Build.DEVICE.startsWith("generic")) ||
       Build.FINGERPRINT.startsWith("generic") ||
       Build.FINGERPRINT.startsWith("unknown") ||
       Build.HARDWARE.contains("goldfish") ||
@@ -139,29 +134,27 @@ public class CapacitorUpdater {
     return (percent * (max - min)) / 100 + min;
   }
 
-  void notifyDownload(final String id, final int percent) {
-    return;
-  }
+  void notifyDownload(final String id, final int percent) {}
 
-  void notifyListeners(final String id, final JSObject res) {
-    return;
-  }
+  void directUpdateFinish(final BundleInfo latest) {}
 
-  private String randomString(final int len) {
-    final StringBuilder sb = new StringBuilder(len);
-    for (int i = 0; i < len; i++) sb.append(
-      AB.charAt(rnd.nextInt(AB.length()))
-    );
+  void notifyListeners(final String id, final JSObject res) {}
+
+  private String randomString() {
+    final StringBuilder sb = new StringBuilder(10);
+    for (int i = 0; i < 10; i++) sb.append(AB.charAt(rnd.nextInt(AB.length())));
     return sb.toString();
   }
 
   private File unzip(final String id, final File zipFile, final String dest)
     throws IOException {
     final File targetDirectory = new File(this.documentsDir, dest);
-    final ZipInputStream zis = new ZipInputStream(
-      new BufferedInputStream(new FileInputStream(zipFile))
-    );
-    try {
+    try (
+      final BufferedInputStream bis = new BufferedInputStream(
+        new FileInputStream(zipFile)
+      );
+      final ZipInputStream zis = new ZipInputStream(bis)
+    ) {
       int count;
       final int bufferSize = 8192;
       final byte[] buffer = new byte[bufferSize];
@@ -178,6 +171,7 @@ public class CapacitorUpdater {
             "unzip: Windows path is not supported, please use unix path as require by zip RFC: " +
             entry.getName()
           );
+          this.sendStats("windows_path_fail");
         }
         final File file = new File(targetDirectory, entry.getName());
         final String canonicalPath = file.getCanonicalPath();
@@ -185,6 +179,7 @@ public class CapacitorUpdater {
         final File dir = entry.isDirectory() ? file : file.getParentFile();
 
         if (!canonicalPath.startsWith(canonicalDir)) {
+          this.sendStats("canonical_path_fail");
           throw new FileNotFoundException(
             "SecurityException, Failed to ensure directory is the start path : " +
             canonicalDir +
@@ -193,7 +188,9 @@ public class CapacitorUpdater {
           );
         }
 
+        assert dir != null;
         if (!dir.isDirectory() && !dir.mkdirs()) {
+          this.sendStats("directory_path_fail");
           throw new FileNotFoundException(
             "Failed to ensure directory: " + dir.getAbsolutePath()
           );
@@ -220,12 +217,9 @@ public class CapacitorUpdater {
         lengthRead += entry.getCompressedSize();
       }
       return targetDirectory;
-    } finally {
-      try {
-        zis.close();
-      } catch (final IOException e) {
-        Log.e(TAG, "Failed to close zip input stream", e);
-      }
+    } catch (IOException e) {
+      this.sendStats("unzip_fail");
+      throw new IOException("Failed to unzip: " + zipFile.getPath());
     }
   }
 
@@ -237,7 +231,7 @@ public class CapacitorUpdater {
       );
     }
     final File destinationFile = new File(this.documentsDir, dest);
-    destinationFile.getParentFile().mkdirs();
+    Objects.requireNonNull(destinationFile.getParentFile()).mkdirs();
     final String[] entries = sourceFile.list(this.filter);
     if (entries == null || entries.length == 0) {
       throw new IOException(
@@ -254,32 +248,41 @@ public class CapacitorUpdater {
   }
 
   public void onResume() {
-    this.activity.registerReceiver(
-        receiver,
-        new IntentFilter(DownloadService.NOTIFICATION)
-      );
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      this.activity.registerReceiver(
+          receiver,
+          new IntentFilter(DownloadService.NOTIFICATION),
+          RECEIVER_NOT_EXPORTED
+        );
+    } else {
+      this.activity.registerReceiver(
+          receiver,
+          new IntentFilter(DownloadService.NOTIFICATION)
+        );
+    }
   }
 
   public void onPause() {
     this.activity.unregisterReceiver(receiver);
   }
 
-  private BroadcastReceiver receiver = new BroadcastReceiver() {
+  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 (action == DownloadService.PERCENTDOWNLOAD) {
+        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 (action == DownloadService.NOTIFICATION) {
+        } 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);
           Log.i(
             CapacitorUpdater.TAG,
             "res " +
@@ -291,7 +294,9 @@ public class CapacitorUpdater {
             " " +
             sessionKey +
             " " +
-            checksum
+            checksum +
+            " " +
+            error
           );
           if (dest == null) {
             final JSObject ret = new JSObject();
@@ -299,11 +304,12 @@ public class CapacitorUpdater {
               "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);
-            CapacitorUpdater.this.sendStats(
-                "download_fail",
-                CapacitorUpdater.this.getCurrentBundle().getVersionName()
-              );
             return;
           }
           CapacitorUpdater.this.finishDownload(
@@ -321,7 +327,7 @@ public class CapacitorUpdater {
     }
   };
 
-  public void finishDownload(
+  public Boolean finishDownload(
     String id,
     String dest,
     String version,
@@ -335,7 +341,7 @@ public class CapacitorUpdater {
       final String checksum;
       checksum = this.getChecksum(downloaded);
       this.notifyDownload(id, 71);
-      final File unzipped = this.unzip(id, downloaded, this.randomString(10));
+      final File unzipped = this.unzip(id, downloaded, this.randomString());
       downloaded.delete();
       this.notifyDownload(id, 91);
       final String idName = bundleDirectory + "/" + id;
@@ -357,9 +363,9 @@ public class CapacitorUpdater {
       ) {
         Log.e(
           CapacitorUpdater.TAG,
-          "Error checksum " + next.getChecksum() + " " + checksum
+          "Error checksum " + checksumRes + " " + checksum
         );
-        this.sendStats("checksum_fail", getCurrentBundle().getVersionName());
+        this.sendStats("checksum_fail");
         final Boolean res = this.delete(id);
         if (res) {
           Log.i(
@@ -373,7 +379,12 @@ public class CapacitorUpdater {
       ret.put("bundle", next.toJSON());
       CapacitorUpdater.this.notifyListeners("updateAvailable", ret);
       if (setNext) {
-        this.setNextBundle(next.getId());
+        if (this.directUpdate) {
+          CapacitorUpdater.this.directUpdateFinish(next);
+          this.directUpdate = false;
+        } else {
+          this.setNextBundle(next.getId());
+        }
       }
     } catch (IOException e) {
       e.printStackTrace();
@@ -383,11 +394,10 @@ public class CapacitorUpdater {
         CapacitorUpdater.this.getCurrentBundle().getVersionName()
       );
       CapacitorUpdater.this.notifyListeners("downloadFailed", ret);
-      CapacitorUpdater.this.sendStats(
-          "download_fail",
-          CapacitorUpdater.this.getCurrentBundle().getVersionName()
-        );
+      CapacitorUpdater.this.sendStats("download_fail");
+      return false;
     }
+    return true;
   }
 
   private void downloadFileBackground(
@@ -412,20 +422,17 @@ public class CapacitorUpdater {
     this.activity.startService(intent);
   }
 
-  private File downloadFile(
+  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 InputStream is = u.openStream();
-    final DataInputStream dis = new DataInputStream(is);
 
     final File target = new File(this.documentsDir, dest);
-    target.getParentFile().mkdirs();
+    Objects.requireNonNull(target.getParentFile()).mkdirs();
     target.createNewFile();
-    final FileOutputStream fos = new FileOutputStream(target);
 
     final long totalLength = connection.getContentLength();
     final int bufferSize = 1024;
@@ -435,16 +442,25 @@ public class CapacitorUpdater {
     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 / (float) totalLength) * 100);
-      if (totalLength > 1 && newPercent != percent) {
-        percent = newPercent;
-        this.notifyDownload(id, this.calcTotalPercent(percent, 10, 70));
+    try (
+      final InputStream is = connection.getInputStream();
+      final DataInputStream dis = new DataInputStream(is);
+      final FileOutputStream fos = new FileOutputStream(target)
+    ) {
+      while ((length = dis.read(buffer)) > 0) {
+        fos.write(buffer, 0, length);
+        final int newPercent = (int) ((bytesRead / (float) totalLength) * 100);
+        if (totalLength > 1 && newPercent != percent) {
+          percent = newPercent;
+          this.notifyDownload(id, this.calcTotalPercent(percent, 10, 70));
+        }
+        bytesRead += length;
       }
-      bytesRead += length;
+    } catch (OutOfMemoryError e) {
+      Log.e(TAG, "OutOfMemoryError while downloading file", e);
+      this.sendStats("low_mem_fail");
+      throw new IOException("OutOfMemoryError while downloading file");
     }
-    return target;
   }
 
   private void deleteDirectory(final File file) throws IOException {
@@ -468,12 +484,15 @@ public class CapacitorUpdater {
   }
 
   private String getChecksum(File file) throws IOException {
-    byte[] bytes = new byte[(int) file.length()];
+    final int BUFFER_SIZE = 1024 * 1024 * 5; // 5 MB buffer size
+    CRC32 crc = new CRC32();
     try (FileInputStream fis = new FileInputStream(file)) {
-      fis.read(bytes);
+      byte[] buffer = new byte[BUFFER_SIZE];
+      int length;
+      while ((length = fis.read(buffer)) != -1) {
+        crc.update(buffer, 0, length);
+      }
     }
-    CRC32 crc = new CRC32();
-    crc.update(bytes);
     String enc = String.format("%08X", crc.getValue());
     return enc.toLowerCase();
   }
@@ -488,8 +507,10 @@ public class CapacitorUpdater {
       this.privateKey == null ||
       this.privateKey.isEmpty() ||
       ivSessionKey == null ||
-      ivSessionKey.isEmpty()
+      ivSessionKey.isEmpty() ||
+      ivSessionKey.split(":").length != 2
     ) {
+      Log.i(TAG, "Cannot found privateKey or sessionKey");
       return;
     }
     try {
@@ -504,17 +525,24 @@ public class CapacitorUpdater {
       byte[] decryptedSessionKey = CryptoCipher.decryptRSA(sessionKey, pKey);
       SecretKey sKey = CryptoCipher.byteToSessionKey(decryptedSessionKey);
       byte[] content = new byte[(int) file.length()];
-      BufferedInputStream bis = new BufferedInputStream(
-        new FileInputStream(file)
-      );
-      DataInputStream dis = new DataInputStream(bis);
-      dis.readFully(content);
-      dis.close();
-      byte[] decrypted = CryptoCipher.decryptAES(content, sKey, iv);
-      // write the decrypted string to the file
-      FileOutputStream fos = new FileOutputStream(file.getAbsolutePath());
-      fos.write(decrypted);
-      fos.close();
+
+      try (
+        final FileInputStream fis = new FileInputStream(file);
+        final BufferedInputStream bis = new BufferedInputStream(fis);
+        final DataInputStream dis = new DataInputStream(bis)
+      ) {
+        dis.readFully(content);
+        dis.close();
+        byte[] decrypted = CryptoCipher.decryptAES(content, sKey, iv);
+        // write the decrypted string to the file
+        try (
+          final FileOutputStream fos = new FileOutputStream(
+            file.getAbsolutePath()
+          )
+        ) {
+          fos.write(decrypted);
+        }
+      }
     } catch (GeneralSecurityException e) {
       Log.i(TAG, "decryptFile fail");
       this.sendStats("decrypt_fail", version);
@@ -529,7 +557,7 @@ public class CapacitorUpdater {
     final String sessionKey,
     final String checksum
   ) {
-    final String id = this.randomString(10);
+    final String id = this.randomString();
     this.saveBundleInfo(
         id,
         new BundleInfo(
@@ -548,7 +576,7 @@ public class CapacitorUpdater {
         version,
         sessionKey,
         checksum,
-        this.randomString(10)
+        this.randomString()
       );
   }
 
@@ -558,7 +586,7 @@ public class CapacitorUpdater {
     final String sessionKey,
     final String checksum
   ) throws IOException {
-    final String id = this.randomString(10);
+    final String id = this.randomString();
     this.saveBundleInfo(
         id,
         new BundleInfo(
@@ -570,15 +598,18 @@ public class CapacitorUpdater {
         )
       );
     this.notifyDownload(id, 0);
-    final String idName = bundleDirectory + "/" + id;
     this.notifyDownload(id, 5);
-    final String dest = this.randomString(10);
-    final File downloaded = this.downloadFile(id, url, dest);
-    this.finishDownload(id, dest, version, sessionKey, checksum, false);
+    final String dest = this.randomString();
+    this.downloadFile(id, url, dest);
+    final Boolean finished =
+      this.finishDownload(id, dest, version, sessionKey, checksum, false);
+    final BundleStatus status = finished
+      ? BundleStatus.PENDING
+      : BundleStatus.ERROR;
     BundleInfo info = new BundleInfo(
       id,
       version,
-      BundleStatus.PENDING,
+      status,
       new Date(System.currentTimeMillis()),
       checksum
     );
@@ -591,7 +622,7 @@ public class CapacitorUpdater {
     final File destHot = new File(this.documentsDir, bundleDirectory);
     Log.d(TAG, "list File : " + destHot.getPath());
     if (destHot.exists()) {
-      for (final File i : destHot.listFiles()) {
+      for (final File i : Objects.requireNonNull(destHot.listFiles())) {
         final String id = i.getName();
         res.add(this.getBundleInfo(id));
       }
@@ -634,10 +665,12 @@ public class CapacitorUpdater {
   private boolean bundleExists(final String id) {
     final File bundle = this.getBundleDirectory(id);
     final BundleInfo bundleInfo = this.getBundleInfo(id);
-    if (bundle == null || !bundle.exists() || bundleInfo.isDeleted()) {
-      return false;
-    }
-    return new File(bundle.getPath(), "/index.html").exists();
+    return (
+      bundle.isDirectory() &&
+      bundle.exists() &&
+      new File(bundle.getPath(), "/index.html").exists() &&
+      !bundleInfo.isDeleted()
+    );
   }
 
   public Boolean set(final BundleInfo bundle) {
@@ -653,9 +686,10 @@ public class CapacitorUpdater {
     final File bundle = this.getBundleDirectory(id);
     Log.i(TAG, "Setting next active bundle: " + id);
     if (this.bundleExists(id)) {
+      var currentBundleName = this.getCurrentBundle().getVersionName();
       this.setCurrentBundle(bundle);
       this.setBundleStatus(id, BundleStatus.PENDING);
-      this.sendStats("set", newBundle.getVersionName());
+      this.sendStats("set", newBundle.getVersionName(), currentBundleName);
       return true;
     }
     this.setBundleStatus(id, BundleStatus.ERROR);
@@ -663,6 +697,16 @@ public class CapacitorUpdater {
     return false;
   }
 
+  public void autoReset() {
+    final BundleInfo currentBundle = this.getCurrentBundle();
+    if (
+      !currentBundle.isBuiltin() && !this.bundleExists(currentBundle.getId())
+    ) {
+      Log.i(TAG, "Folder at bundle path does not exist. Triggering reset.");
+      this.reset();
+    }
+  }
+
   public void reset() {
     this.reset(false);
   }
@@ -701,11 +745,16 @@ public class CapacitorUpdater {
 
   public void reset(final boolean internal) {
     Log.d(CapacitorUpdater.TAG, "reset: " + internal);
+    var currentBundleName = this.getCurrentBundle().getVersionName();
     this.setCurrentBundle(new File("public"));
     this.setFallbackBundle(null);
     this.setNextBundle(null);
     if (!internal) {
-      this.sendStats("reset", this.getCurrentBundle().getVersionName());
+      this.sendStats(
+          "reset",
+          this.getCurrentBundle().getVersionName(),
+          currentBundleName
+        );
     }
   }
 
@@ -722,9 +771,21 @@ public class CapacitorUpdater {
     json.put("plugin_version", this.PLUGIN_VERSION);
     json.put("is_emulator", this.isEmulator());
     json.put("is_prod", this.isProd());
+    json.put("defaultChannel", this.defaultChannel);
     return json;
   }
 
+  private JsonObjectRequest setRetryPolicy(JsonObjectRequest request) {
+    request.setRetryPolicy(
+      new DefaultRetryPolicy(
+        this.timeout,
+        DefaultRetryPolicy.DEFAULT_MAX_RETRIES,
+        DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
+      )
+    );
+    return request;
+  }
+
   private JSObject createError(String message, VolleyError error) {
     NetworkResponse response = error.networkResponse;
     final JSObject retError = new JSObject();
@@ -737,24 +798,24 @@ public class CapacitorUpdater {
         );
         retError.put("message", message + ": " + json);
       } catch (UnsupportedEncodingException e) {
-        retError.put("message", message + ": " + e.toString());
+        retError.put("message", message + ": " + e);
       }
     } else {
-      retError.put("message", message + ": " + error.toString());
+      retError.put("message", message + ": " + error);
     }
     Log.e(TAG, message + ": " + retError);
     return retError;
   }
 
   public void getLatest(final String updateUrl, final Callback callback) {
-    JSONObject json = null;
+    JSONObject json;
     try {
       json = this.createInfoObject();
     } catch (JSONException e) {
       Log.e(TAG, "Error getLatest JSONException", e);
       e.printStackTrace();
       final JSObject retError = new JSObject();
-      retError.put("message", "Cannot get info: " + e.toString());
+      retError.put("message", "Cannot get info: " + e);
       retError.put("error", "json_error");
       callback.callback(retError);
       return;
@@ -766,56 +827,95 @@ public class CapacitorUpdater {
       Request.Method.POST,
       updateUrl,
       json,
-      new Response.Listener<JSONObject>() {
-        @Override
-        public void onResponse(JSONObject res) {
-          final JSObject ret = new JSObject();
-          Iterator<String> keys = res.keys();
-          while (keys.hasNext()) {
-            String key = keys.next();
-            if (res.has(key)) {
-              try {
-                if ("session_key".equals(key)) {
-                  ret.put("sessionKey", res.get(key));
-                } else {
-                  ret.put(key, res.get(key));
-                }
-              } catch (JSONException e) {
-                e.printStackTrace();
-                final JSObject retError = new JSObject();
-                retError.put("message", "Cannot set info: " + e.toString());
-                retError.put("error", "response_error");
-                callback.callback(retError);
+      res -> {
+        final JSObject ret = new JSObject();
+        Iterator<String> keys = res.keys();
+        while (keys.hasNext()) {
+          String key = keys.next();
+          if (res.has(key)) {
+            try {
+              if ("session_key".equals(key)) {
+                ret.put("sessionKey", res.get(key));
+              } else {
+                ret.put(key, res.get(key));
               }
+            } catch (JSONException e) {
+              e.printStackTrace();
+              final JSObject retError = new JSObject();
+              retError.put("message", "Cannot set info: " + e);
+              retError.put("error", "response_error");
+              callback.callback(retError);
             }
           }
-          callback.callback(ret);
         }
+        callback.callback(ret);
       },
-      new Response.ErrorListener() {
-        @Override
-        public void onErrorResponse(VolleyError error) {
-          callback.callback(
-            CapacitorUpdater.this.createError("Error get latest", error)
-          );
-        }
-      }
+      error ->
+        callback.callback(
+          CapacitorUpdater.this.createError("Error get latest", error)
+        )
     );
-    request.setRetryPolicy(
-      new DefaultRetryPolicy(
-        this.timeout,
-        DefaultRetryPolicy.DEFAULT_MAX_RETRIES,
-        DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
-      )
+    this.requestQueue.add(setRetryPolicy(request));
+  }
+
+  public void unsetChannel(final Callback callback) {
+    String channelUrl = this.channelUrl;
+    if (channelUrl == null || channelUrl.isEmpty()) {
+      Log.e(TAG, "Channel URL is not set");
+      final JSObject retError = new JSObject();
+      retError.put("message", "channelUrl missing");
+      retError.put("error", "missing_config");
+      callback.callback(retError);
+      return;
+    }
+    JSONObject json;
+    try {
+      json = this.createInfoObject();
+    } catch (JSONException e) {
+      Log.e(TAG, "Error unsetChannel JSONException", e);
+      e.printStackTrace();
+      final JSObject retError = new JSObject();
+      retError.put("message", "Cannot get info: " + e);
+      retError.put("error", "json_error");
+      callback.callback(retError);
+      return;
+    }
+    // Building a request
+    JsonObjectRequest request = new JsonObjectRequest(
+      Request.Method.DELETE,
+      channelUrl,
+      json,
+      res -> {
+        final JSObject ret = new JSObject();
+        Iterator<String> keys = res.keys();
+        while (keys.hasNext()) {
+          String key = keys.next();
+          if (res.has(key)) {
+            try {
+              ret.put(key, res.get(key));
+            } catch (JSONException e) {
+              e.printStackTrace();
+              final JSObject retError = new JSObject();
+              retError.put("message", "Cannot unset channel: " + e);
+              retError.put("error", "response_error");
+              callback.callback(ret);
+            }
+          }
+        }
+        Log.i(TAG, "Channel unset");
+        callback.callback(ret);
+      },
+      error ->
+        callback.callback(
+          CapacitorUpdater.this.createError("Error unset channel", error)
+        )
     );
-    this.requestQueue.add(request);
+    this.requestQueue.add(setRetryPolicy(request));
   }
 
   public void setChannel(final String channel, final Callback callback) {
     String channelUrl = this.channelUrl;
-    if (
-      channelUrl == null || "".equals(channelUrl) || channelUrl.length() == 0
-    ) {
+    if (channelUrl == null || channelUrl.isEmpty()) {
       Log.e(TAG, "Channel URL is not set");
       final JSObject retError = new JSObject();
       retError.put("message", "channelUrl missing");
@@ -823,7 +923,7 @@ public class CapacitorUpdater {
       callback.callback(retError);
       return;
     }
-    JSONObject json = null;
+    JSONObject json;
     try {
       json = this.createInfoObject();
       json.put("channel", channel);
@@ -831,7 +931,7 @@ public class CapacitorUpdater {
       Log.e(TAG, "Error setChannel JSONException", e);
       e.printStackTrace();
       final JSObject retError = new JSObject();
-      retError.put("message", "Cannot get info: " + e.toString());
+      retError.put("message", "Cannot get info: " + e);
       retError.put("error", "json_error");
       callback.callback(retError);
       return;
@@ -841,53 +941,37 @@ public class CapacitorUpdater {
       Request.Method.POST,
       channelUrl,
       json,
-      new Response.Listener<JSONObject>() {
-        @Override
-        public void onResponse(JSONObject res) {
-          final JSObject ret = new JSObject();
-          Iterator<String> keys = res.keys();
-          while (keys.hasNext()) {
-            String key = keys.next();
-            if (res.has(key)) {
-              try {
-                ret.put(key, res.get(key));
-              } catch (JSONException e) {
-                e.printStackTrace();
-                final JSObject retError = new JSObject();
-                retError.put("message", "Cannot set channel: " + e.toString());
-                retError.put("error", "response_error");
-                callback.callback(ret);
-              }
+      res -> {
+        final JSObject ret = new JSObject();
+        Iterator<String> keys = res.keys();
+        while (keys.hasNext()) {
+          String key = keys.next();
+          if (res.has(key)) {
+            try {
+              ret.put(key, res.get(key));
+            } catch (JSONException e) {
+              e.printStackTrace();
+              final JSObject retError = new JSObject();
+              retError.put("message", "Cannot set channel: " + e);
+              retError.put("error", "response_error");
+              callback.callback(ret);
             }
           }
-          Log.i(TAG, "Channel set to \"" + channel);
-          callback.callback(ret);
         }
+        Log.i(TAG, "Channel set to \"" + channel);
+        callback.callback(ret);
       },
-      new Response.ErrorListener() {
-        @Override
-        public void onErrorResponse(VolleyError error) {
-          callback.callback(
-            CapacitorUpdater.this.createError("Error set channel", error)
-          );
-        }
-      }
-    );
-    request.setRetryPolicy(
-      new DefaultRetryPolicy(
-        this.timeout,
-        DefaultRetryPolicy.DEFAULT_MAX_RETRIES,
-        DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
-      )
+      error ->
+        callback.callback(
+          CapacitorUpdater.this.createError("Error set channel", error)
+        )
     );
-    this.requestQueue.add(request);
+    this.requestQueue.add(setRetryPolicy(request));
   }
 
   public void getChannel(final Callback callback) {
     String channelUrl = this.channelUrl;
-    if (
-      channelUrl == null || "".equals(channelUrl) || channelUrl.length() == 0
-    ) {
+    if (channelUrl == null || channelUrl.isEmpty()) {
       Log.e(TAG, "Channel URL is not set");
       final JSObject retError = new JSObject();
       retError.put("message", "Channel URL is not set");
@@ -895,14 +979,14 @@ public class CapacitorUpdater {
       callback.callback(retError);
       return;
     }
-    JSONObject json = null;
+    JSONObject json;
     try {
       json = this.createInfoObject();
     } catch (JSONException e) {
       Log.e(TAG, "Error getChannel JSONException", e);
       e.printStackTrace();
       final JSObject retError = new JSObject();
-      retError.put("message", "Cannot get info: " + e.toString());
+      retError.put("message", "Cannot get info: " + e);
       retError.put("error", "json_error");
       callback.callback(retError);
       return;
@@ -912,52 +996,52 @@ public class CapacitorUpdater {
       Request.Method.PUT,
       channelUrl,
       json,
-      new Response.Listener<JSONObject>() {
-        @Override
-        public void onResponse(JSONObject res) {
-          final JSObject ret = new JSObject();
-          Iterator<String> keys = res.keys();
-          while (keys.hasNext()) {
-            String key = keys.next();
-            if (res.has(key)) {
-              try {
-                ret.put(key, res.get(key));
-              } catch (JSONException e) {
-                e.printStackTrace();
-              }
+      res -> {
+        final JSObject ret = new JSObject();
+        Iterator<String> keys = res.keys();
+        while (keys.hasNext()) {
+          String key = keys.next();
+          if (res.has(key)) {
+            try {
+              ret.put(key, res.get(key));
+            } catch (JSONException e) {
+              e.printStackTrace();
             }
           }
-          Log.i(TAG, "Channel get to \"" + ret);
-          callback.callback(ret);
         }
+        Log.i(TAG, "Channel get to \"" + ret);
+        callback.callback(ret);
       },
-      new Response.ErrorListener() {
-        @Override
-        public void onErrorResponse(VolleyError error) {
-          callback.callback(
-            CapacitorUpdater.this.createError("Error get channel", error)
-          );
-        }
-      }
-    );
-    request.setRetryPolicy(
-      new DefaultRetryPolicy(
-        this.timeout,
-        DefaultRetryPolicy.DEFAULT_MAX_RETRIES,
-        DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
-      )
+      error ->
+        callback.callback(
+          CapacitorUpdater.this.createError("Error get channel", error)
+        )
     );
-    this.requestQueue.add(request);
+    this.requestQueue.add(setRetryPolicy(request));
+  }
+
+  public void sendStats(final String action) {
+    this.sendStats(action, this.getCurrentBundle().getVersionName());
   }
 
   public void sendStats(final String action, final String versionName) {
+    this.sendStats(action, versionName, "");
+  }
+
+  public void sendStats(
+    final String action,
+    final String versionName,
+    final String oldVersionName
+  ) {
     String statsUrl = this.statsUrl;
-    if (statsUrl == null || "".equals(statsUrl) || statsUrl.length() == 0) {
+    if (statsUrl == null || statsUrl.isEmpty()) {
       return;
     }
-    JSONObject json = null;
+    JSONObject json;
     try {
       json = this.createInfoObject();
+      json.put("version_name", versionName);
+      json.put("old_version_name", oldVersionName);
       json.put("action", action);
     } catch (JSONException e) {
       Log.e(TAG, "Error sendStats JSONException", e);
@@ -969,30 +1053,11 @@ public class CapacitorUpdater {
       Request.Method.POST,
       statsUrl,
       json,
-      new Response.Listener<JSONObject>() {
-        @Override
-        public void onResponse(JSONObject response) {
-          Log.i(
-            TAG,
-            "Stats send for \"" + action + "\", version " + versionName
-          );
-        }
-      },
-      new Response.ErrorListener() {
-        @Override
-        public void onErrorResponse(VolleyError error) {
-          CapacitorUpdater.this.createError("Error send stats", error);
-        }
-      }
+      response ->
+        Log.i(TAG, "Stats send for \"" + action + "\", version " + versionName),
+      error -> CapacitorUpdater.this.createError("Error send stats", error)
     );
-    request.setRetryPolicy(
-      new DefaultRetryPolicy(
-        this.timeout,
-        DefaultRetryPolicy.DEFAULT_MAX_RETRIES,
-        DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
-      )
-    );
-    this.requestQueue.add(request);
+    this.requestQueue.add(setRetryPolicy(request));
   }
 
   public BundleInfo getBundleInfo(final String id) {
@@ -1000,7 +1065,6 @@ public class CapacitorUpdater {
     if (id != null) {
       trueId = id;
     }
-    Log.d(TAG, "Getting info for bundle [" + trueId + "]");
     BundleInfo result;
     if (BundleInfo.ID_BUILTIN.equals(trueId)) {
       result = new BundleInfo(trueId, null, BundleStatus.SUCCESS, "", "");
@@ -1033,7 +1097,7 @@ public class CapacitorUpdater {
     this.saveBundleInfo(id, null);
   }
 
-  private void saveBundleInfo(final String id, final BundleInfo info) {
+  public void saveBundleInfo(final String id, final BundleInfo info) {
     if (
       id == null || (info != null && (info.isBuiltin() || info.isUnknown()))
     ) {
@@ -1052,14 +1116,6 @@ public class CapacitorUpdater {
     this.editor.commit();
   }
 
-  public void setVersionName(final String id, final String name) {
-    if (id != null) {
-      Log.d(TAG, "Setting name for bundle [" + id + "] to " + name);
-      BundleInfo info = this.getBundleInfo(id);
-      this.saveBundleInfo(id, info.setVersionName(name));
-    }
-  }
-
   private void setBundleStatus(final String id, final BundleStatus status) {
     if (id != null && status != null) {
       BundleInfo info = this.getBundleInfo(id);
@@ -1083,7 +1139,7 @@ public class CapacitorUpdater {
 
   public String getCurrentBundlePath() {
     String path = this.prefs.getString(WebView.CAP_SERVER_PATH, "public");
-    if ("".equals(path.trim())) {
+    if (path.trim().isEmpty()) {
       return "public";
     }
     return path;