|
1 | 1 | package com.rnziparchive; |
2 | 2 |
|
3 | 3 | import android.content.res.AssetFileDescriptor; |
| 4 | +import android.os.Build; |
4 | 5 | import android.util.Log; |
5 | 6 |
|
6 | 7 | import com.facebook.react.bridge.Arguments; |
@@ -141,7 +142,13 @@ public void run() { |
141 | 142 | final long[] extractedBytes = {0}; |
142 | 143 | final int[] lastPercentage = {0}; |
143 | 144 |
|
144 | | - final ZipFile zipFile = new ZipFile(zipFilePath, Charset.forName(charset)); |
| 145 | + ZipFile zipFile = null; |
| 146 | + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { |
| 147 | + zipFile = new ZipFile(zipFilePath, Charset.forName(charset)); |
| 148 | + } else { |
| 149 | + zipFile = new ZipFile(zipFilePath); |
| 150 | + } |
| 151 | + |
145 | 152 | final Enumeration<? extends ZipEntry> entries = zipFile.entries(); |
146 | 153 | Log.d(TAG, "Zip has " + zipFile.size() + " entries"); |
147 | 154 | while (entries.hasMoreElements()) { |
@@ -434,7 +441,12 @@ protected void updateProgress(long extractedBytes, long totalSize, String zipFil |
434 | 441 | private long getUncompressedSize(String zipFilePath, String charset) { |
435 | 442 | long totalSize = 0; |
436 | 443 | try { |
437 | | - ZipFile zipFile = new ZipFile(zipFilePath, Charset.forName(charset)); |
| 444 | + ZipFile zipFile = null; |
| 445 | + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { |
| 446 | + zipFile = new ZipFile(zipFilePath, Charset.forName(charset)); |
| 447 | + } else { |
| 448 | + zipFile = new ZipFile(zipFilePath); |
| 449 | + } |
438 | 450 | Enumeration<? extends ZipEntry> entries = zipFile.entries(); |
439 | 451 | while (entries.hasMoreElements()) { |
440 | 452 | ZipEntry entry = entries.nextElement(); |
|
0 commit comments