react-native-zip-archive 7.0.1 → 7.0.2-beta.1

package/android/build.gradle

@@ -37,5 +37,5 @@ repositories {
 
 dependencies {
     implementation "com.facebook.react:react-native:+"
-    implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '2.+'
+    implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '2.11.5'
 }

package/android/src/main/java/com/rnziparchive/RNZipArchiveModule.java

@@ -1,6 +1,7 @@
 package com.rnziparchive;
 
 import android.content.res.AssetFileDescriptor;
+import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
 
@@ -23,6 +24,7 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.zip.ZipEntry;
@@ -36,6 +38,7 @@ import net.lingala.zip4j.model.enums.CompressionMethod;
 import net.lingala.zip4j.model.enums.CompressionLevel;
 import net.lingala.zip4j.model.enums.EncryptionMethod;
 import net.lingala.zip4j.model.enums.AesKeyStrength;
+import net.lingala.zip4j.progress.ProgressMonitor;
 
 import java.nio.charset.Charset;
 
@@ -67,7 +70,7 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
 
   @ReactMethod
   public void unzipWithPassword(final String zipFilePath, final String destDirectory,
-        final String password, final Promise promise) {
+                                final String password, final Promise promise) {
     new Thread(new Runnable() {
       @Override
       public void run() {
@@ -92,11 +95,11 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
             String destDirCanonicalPath = (new File(destDirectory).getCanonicalPath()) + File.separator;
 
             if (!canonicalPath.startsWith(destDirCanonicalPath)) {
-                 throw new SecurityException(String.format("Found Zip Path Traversal Vulnerability with %s", canonicalPath));
+              throw new SecurityException(String.format("Found Zip Path Traversal Vulnerability with %s", canonicalPath));
             }
 
             if (!fileHeader.isDirectory()) {
-               zipFile.extractFile(fileHeader, destDirectory);
+              zipFile.extractFile(fileHeader, destDirectory);
               extractedFileNames.add(fileHeader.getFileName());
             }
             updateProgress(i + 1, totalFiles, zipFilePath);
@@ -149,11 +152,26 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
             zipFile = new net.lingala.zip4j.ZipFile(zipFilePath);
           }
 
+          ProgressMonitor progressMonitor = zipFile.getProgressMonitor();
+
+          zipFile.setRunInThread(true);
           zipFile.extractAll(destDirectory);
 
-          zipFile.close();
-          updateProgress(1, 1, zipFilePath); // force 100%
-          promise.resolve(destDirectory);
+          while (!progressMonitor.getState().equals(ProgressMonitor.State.READY)) {
+            updateProgress(progressMonitor.getWorkCompleted(), progressMonitor.getTotalWork(), zipFilePath);
+
+            Thread.sleep(100);
+          }
+
+          if (progressMonitor.getResult().equals(ProgressMonitor.Result.SUCCESS)) {
+            zipFile.close();
+            updateProgress(1, 1, zipFilePath); // force 100%
+            promise.resolve(destDirectory);
+          } else if (progressMonitor.getResult().equals(ProgressMonitor.Result.ERROR)) {
+            throw new Exception("Error occurred. Error message: " + progressMonitor.getException().getMessage());
+          } else if (progressMonitor.getResult().equals(ProgressMonitor.Result.CANCELLED)) {
+            throw new Exception("Task cancelled");
+          }
         } catch (Exception ex) {
           updateProgress(0, 1, zipFilePath); // force 0%
           promise.reject(null, "Failed to extract file " + ex.getLocalizedMessage());
@@ -178,12 +196,21 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
       @Override
       public void run() {
         InputStream assetsInputStream;
-        final long size;
+        final long compressedSize;
 
         try {
-          assetsInputStream = getReactApplicationContext().getAssets().open(assetsPath);
-          AssetFileDescriptor fileDescriptor = getReactApplicationContext().getAssets().openFd(assetsPath);
-          size = fileDescriptor.getLength();
+          if(assetsPath.startsWith("content://")) {
+            var assetUri = Uri.parse(assetsPath);
+            var contentResolver = getReactApplicationContext().getContentResolver();
+
+            assetsInputStream = contentResolver.openInputStream(assetUri);
+            var fileDescriptor = contentResolver.openFileDescriptor(assetUri, "r");
+            compressedSize = fileDescriptor.getStatSize();
+          } else {
+            assetsInputStream = getReactApplicationContext().getAssets().open(assetsPath);
+            AssetFileDescriptor fileDescriptor = getReactApplicationContext().getAssets().openFd(assetsPath);
+            compressedSize = fileDescriptor.getLength();
+          }
         } catch (IOException e) {
           promise.reject(null, String.format("Asset file `%s` could not be opened", assetsPath));
           return;
@@ -201,19 +228,21 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
 
             ZipEntry entry;
 
-            final long[] extractedBytes = {0};
-            final int[] lastPercentage = {0};
+            long extractedBytes = 0;
+            updateProgress(extractedBytes, compressedSize, assetsPath); // force 0%
 
-            updateProgress(0, 1, assetsPath); // force 0%
             File fout;
             while ((entry = zipIn.getNextEntry()) != null) {
               if (entry.isDirectory()) continue;
+
+              Log.i("rnziparchive", "Extracting: " + entry.getName());
+
               fout = new File(destDirectory, entry.getName());
               String canonicalPath = fout.getCanonicalPath();
               String destDirCanonicalPath = (new File(destDirectory).getCanonicalPath()) + File.separator;
 
               if (!canonicalPath.startsWith(destDirCanonicalPath)) {
-                   throw new SecurityException(String.format("Found Zip Path Traversal Vulnerability with %s", canonicalPath));
+                throw new SecurityException(String.format("Found Zip Path Traversal Vulnerability with %s", canonicalPath));
               }
 
               if (!fout.exists()) {
@@ -221,31 +250,22 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
                 (new File(fout.getParent())).mkdirs();
               }
 
-              final ZipEntry finalEntry = entry;
-              StreamUtil.ProgressCallback cb = new StreamUtil.ProgressCallback() {
-                @Override
-                public void onCopyProgress(long bytesRead) {
-                  extractedBytes[0] += bytesRead;
-
-                  int lastTime = lastPercentage[0];
-                  int percentDone = (int) ((double) extractedBytes[0] * 100 / (double) size);
-
-                  // update at most once per percent.
-                  if (percentDone > lastTime) {
-                    lastPercentage[0] = percentDone;
-                    updateProgress(extractedBytes[0], size, finalEntry.getName());
-                  }
-                }
-              };
-
               FileOutputStream out = new FileOutputStream(fout);
               BufferedOutputStream Bout = new BufferedOutputStream(out);
-              StreamUtil.copy(bin, Bout, cb);
+              StreamUtil.copy(bin, Bout, null);
               Bout.close();
               out.close();
+
+              extractedBytes += entry.getCompressedSize();
+
+              // do not let the percentage go over 99% because we want it to hit 100% only when we are sure it's finished
+              if(extractedBytes > compressedSize*0.99) extractedBytes = (long) (compressedSize*0.99);
+
+              updateProgress(extractedBytes, compressedSize, entry.getName());
             }
 
-            updateProgress(1, 1, assetsPath); // force 100%
+            updateProgress(compressedSize, compressedSize, assetsPath); // force 100%
+
             bin.close();
             zipIn.close();
           } catch (Exception ex) {
@@ -276,21 +296,21 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
 
   @ReactMethod
   public void zipFilesWithPassword(final ReadableArray files, final String destFile, final String password,
-                              String encryptionMethod, Promise promise) {
+                                   String encryptionMethod, Promise promise) {
     zipWithPassword(files.toArrayList(), destFile, password, encryptionMethod, promise);
   }
 
 
   @ReactMethod
   public void zipFolderWithPassword(final String folder, final String destFile, final String password,
-                                   String encryptionMethod, Promise promise) {
+                                    String encryptionMethod, Promise promise) {
     ArrayList<Object> folderAsArrayList = new ArrayList<>();
     folderAsArrayList.add(folder);
     zipWithPassword(folderAsArrayList, destFile, password, encryptionMethod, promise);
   }
 
   private void zipWithPassword(final ArrayList<Object> filesOrDirectory, final String destFile, final String password,
-      String encryptionMethod, Promise promise) {
+                               String encryptionMethod, Promise promise) {
     try{
 
       ZipParameters parameters = new ZipParameters();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-zip-archive",
-  "version": "7.0.1",
+  "version": "7.0.2-beta.1",
   "description": "A little wrapper on ZipArchive for react-native",
   "main": "index.js",
   "scripts": {