Skip to content

fix: Revert compatibility fixes for Android 5+ support #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 8, 2025
Merged

fix: Revert compatibility fixes for Android 5+ support #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb2e9f4
fix: update apache commons and support older api
Ldoppea Apr 8, 2025
2101354
fix: upgrade commons-io in gzip for Android 7+
Ldoppea Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,8 @@ repositories {
dependencies {
//noinspection GradleDynamicVersion
implementation 'com.facebook.react:react-native:+' // From node_modules
implementation 'commons-io:commons-io:2.5'
implementation 'org.apache.commons:commons-compress:1.21'
// https://mvnrepository.com/artifact/org.kamranzafar/jtar
implementation 'org.kamranzafar:jtar:2.2'
implementation 'commons-io:commons-io:2.6'
implementation 'org.apache.commons:commons-compress:1.1'
}

def configureReactNativePom(def pom) {
Expand Down
134 changes: 33 additions & 101 deletions android/src/main/java/com/reactlibrary/GzipModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.reactlibrary;

import android.os.Build;

import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
Expand All @@ -13,10 +11,6 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.BufferedOutputStream;
import java.util.zip.GZIPInputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;

import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveException;
Expand All @@ -27,7 +21,6 @@
import org.apache.commons.compress.compressors.CompressorStreamFactory;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.io.FileUtils;
import org.kamranzafar.jtar.TarInputStream;

public class GzipModule extends ReactContextBaseJavaModule {

Expand Down Expand Up @@ -116,89 +109,41 @@ public void unGzip(String source, String target, Boolean force, Promise promise)
public void unGzipTar(String source, String target, Boolean force, Promise promise) {
File sourceFile = new File(source);
File targetFile = new File(target);
if (!checkDir(sourceFile, targetFile, force)) {
if(!checkDir(sourceFile, targetFile, force)){
promise.reject("-2", "error");
return;
}

// Check the Android API level
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
// Android versions below 8.0 (API level 26)
try {
FileInputStream fis = new FileInputStream(sourceFile);
GZIPInputStream gis = new GZIPInputStream(fis);
untar2(gis, targetFile); // Assume untar2 is a method you've implemented for manual extraction
fis.close();
gis.close();

WritableMap map = Arguments.createMap();
map.putString("path", targetFile.getAbsolutePath());
promise.resolve(map);
} catch (IOException e) {
e.printStackTrace();
promise.reject("-2", "ungzip error for API < 26");
}
} else {
// For Android API level 26 and above
try (FileInputStream fileInputStream = FileUtils.openInputStream(sourceFile)) {
final CompressorInputStream compressorInputStream = new CompressorStreamFactory()
.createCompressorInputStream(CompressorStreamFactory.GZIP, fileInputStream);
try (ArchiveInputStream inputStream = new ArchiveStreamFactory()
.createArchiveInputStream(ArchiveStreamFactory.TAR, compressorInputStream)) {
ArchiveEntry archiveEntry = inputStream.getNextEntry();

while (archiveEntry != null) {
File destFile = new File(targetFile, archiveEntry.getName());
if (archiveEntry.isDirectory()) {
destFile.mkdirs();
} else {
try (FileOutputStream outputStream = FileUtils.openOutputStream(destFile)) {
IOUtils.copy(inputStream, outputStream);
}
}
archiveEntry = inputStream.getNextEntry();
}

WritableMap map = Arguments.createMap();
map.putString("path", targetFile.getAbsolutePath());
promise.resolve(map);
}
} catch (IOException | CompressorException | ArchiveException e) {
e.printStackTrace();
promise.reject("-2", "ungzip error");
}
}
}
ArchiveInputStream inputStream = null;
FileInputStream fileInputStream;

private void untar2(GZIPInputStream gis, File targetFile) throws IOException {
// Create a TarInputStream from the GZIPInputStream
TarInputStream tis = new TarInputStream(gis);
org.kamranzafar.jtar.TarEntry entry;

// Iterate through the entries in the TAR stream
while ((entry = tis.getNextEntry()) != null) {
File outputFile = new File(targetFile, entry.getName());

// Check if the entry is a directory
if (entry.isDirectory()) {
outputFile.mkdirs();
} else {
// Ensure parent directories exist
outputFile.getParentFile().mkdirs();

// Write the entry to file
try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(outputFile))) {
int count;
byte data[] = new byte[2048];

// Read data from the entry and write it to the output file
while ((count = tis.read(data)) != -1) {
bos.write(data, 0, count);
}
try{
fileInputStream = FileUtils.openInputStream(sourceFile);
final CompressorInputStream compressorInputStream = new CompressorStreamFactory()
.createCompressorInputStream(CompressorStreamFactory.GZIP, fileInputStream);
inputStream = new ArchiveStreamFactory()
.createArchiveInputStream(ArchiveStreamFactory.TAR, compressorInputStream);
ArchiveEntry archiveEntry = inputStream.getNextEntry();

while (archiveEntry != null) {
File destFile = new File(targetFile, archiveEntry.getName());
if (archiveEntry.isDirectory()) {
destFile.mkdirs();
} else {
final FileOutputStream outputStream = FileUtils.openOutputStream(destFile);
IOUtils.copy(inputStream, outputStream);
outputStream.close();
}
archiveEntry = inputStream.getNextEntry();
}

WritableMap map = Arguments.createMap();
map.putString("path", targetFile.getAbsolutePath());
promise.resolve(map);
} catch (IOException | CompressorException | ArchiveException e) {
e.printStackTrace();
promise.reject("-2", "ungzip error");
}
tis.close();
}

private Boolean checkDir(File sourceFile, File targetFile, Boolean force) {
Expand All @@ -212,30 +157,17 @@ private Boolean checkDir(File sourceFile, File targetFile, Boolean force) {
}

try {
deleteRecursively(targetFile);
if (targetFile.isDirectory()) {
FileUtils.deleteDirectory(targetFile);
} else {
targetFile.delete();
}
targetFile.mkdirs();
} catch (IOException ex) {
return false;
}
}
return true;
}

private void deleteRecursively(File file) throws IOException {
if (file.isDirectory()) {
// List all the directory contents
File[] files = file.listFiles();
if (files != null) { // Some JVMs return null for empty directories
for (File child : files) {
// Recursive delete
deleteRecursively(child);
}
}
}

// Check if file actually exists before deletion
if (!file.delete()) {
throw new IOException("Failed to delete file: " + file.getAbsolutePath());
}
}
}