Skip to content

Commit 6a3d31d

Browse files
authored
Merge pull request #168 from randy-yang/patch-1
Make it compatible on Android 6 devices.
2 parents 8b03e1c + 27e4c22 commit 6a3d31d

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.rnziparchive;
22

33
import android.content.res.AssetFileDescriptor;
4+
import android.os.Build;
45
import android.util.Log;
56

67
import com.facebook.react.bridge.Arguments;
@@ -141,7 +142,13 @@ public void run() {
141142
final long[] extractedBytes = {0};
142143
final int[] lastPercentage = {0};
143144

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+
145152
final Enumeration<? extends ZipEntry> entries = zipFile.entries();
146153
Log.d(TAG, "Zip has " + zipFile.size() + " entries");
147154
while (entries.hasMoreElements()) {
@@ -434,7 +441,12 @@ protected void updateProgress(long extractedBytes, long totalSize, String zipFil
434441
private long getUncompressedSize(String zipFilePath, String charset) {
435442
long totalSize = 0;
436443
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+
}
438450
Enumeration<? extends ZipEntry> entries = zipFile.entries();
439451
while (entries.hasMoreElements()) {
440452
ZipEntry entry = entries.nextElement();

0 commit comments

Comments
 (0)