@capgo/capacitor-updater 5.0.18 → 5.0.19

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

@@ -158,10 +158,12 @@ public class CapacitorUpdater {
   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];
@@ -220,12 +222,6 @@ 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);
-      }
     }
   }
 
@@ -419,13 +415,10 @@ public class CapacitorUpdater {
   ) 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();
     target.createNewFile();
-    final FileOutputStream fos = new FileOutputStream(target);
 
     final long totalLength = connection.getContentLength();
     final int bufferSize = 1024;
@@ -435,14 +428,20 @@ 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 = u.openStream();
+      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;
     }
     return target;
   }
@@ -506,17 +505,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);

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

@@ -55,7 +55,7 @@ public class CapacitorUpdaterPlugin
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "5.0.18";
+  private final String PLUGIN_VERSION = "5.0.19";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;

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

@@ -55,32 +55,35 @@ public class DownloadService extends IntentService {
     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);
+      try (
+        final InputStream is = u.openStream();
+        final DataInputStream dis = new DataInputStream(is)
+      ) {
+        final File target = new File(documentsDir, dest);
+        target.getParentFile().mkdirs();
+        target.createNewFile();
+        try (final FileOutputStream fos = new FileOutputStream(target)) {
+          final long totalLength = connection.getContentLength();
+          final int bufferSize = 1024;
+          final byte[] buffer = new byte[bufferSize];
+          int length;
 
-      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));
+          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, "");
         }
-        bytesRead += length;
       }
-      publishResults(dest, id, version, checksum, sessionKey, "");
     } catch (Exception e) {
       e.printStackTrace();
       publishResults(

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -15,7 +15,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     private var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "5.0.18"
+    private let PLUGIN_VERSION: String = "5.0.19"
     static let updateUrlDefault = "https://api.capgo.app/updates"
     static let statsUrlDefault = "https://api.capgo.app/stats"
     static let channelUrlDefault = "https://api.capgo.app/channel_self"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "5.0.18",
+  "version": "5.0.19",
   "packageManager": "pnpm@8.6.12",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",