Merge pull request #168 from randy-yang/patch-1

Make it compatible on Android 6 devices.
mockingbot · Aug 29, 2019 · 6a3d31d · 6a3d31d
2 parents 8b03e1c + 27e4c22
commit 6a3d31d
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/android/src/main/java/com/rnziparchive/RNZipArchiveModule.java b/android/src/main/java/com/rnziparchive/RNZipArchiveModule.java
@@ -1,6 +1,7 @@
 package com.rnziparchive;
 
 import android.content.res.AssetFileDescriptor;
+import android.os.Build;
 import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
@@ -141,7 +142,13 @@ public void run() {
           final long[] extractedBytes = {0};
           final int[] lastPercentage = {0};
 
-          final ZipFile zipFile = new ZipFile(zipFilePath, Charset.forName(charset));
+          ZipFile zipFile = null;
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            zipFile = new ZipFile(zipFilePath, Charset.forName(charset));
+          } else {
+            zipFile = new ZipFile(zipFilePath);
+          }
+
           final Enumeration<? extends ZipEntry> entries = zipFile.entries();
           Log.d(TAG, "Zip has " + zipFile.size() + " entries");
           while (entries.hasMoreElements()) {
@@ -434,7 +441,12 @@ protected void updateProgress(long extractedBytes, long totalSize, String zipFil
   private long getUncompressedSize(String zipFilePath, String charset) {
     long totalSize = 0;
     try {
-      ZipFile zipFile = new ZipFile(zipFilePath, Charset.forName(charset));
+      ZipFile zipFile = null;
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        zipFile = new ZipFile(zipFilePath, Charset.forName(charset));
+      } else {
+        zipFile = new ZipFile(zipFilePath);
+      }
       Enumeration<? extends ZipEntry> entries = zipFile.entries();
       while (entries.hasMoreElements()) {
         ZipEntry entry = entries.nextElement();