ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-12-12 13:57:46 +01:00
Code Issues Projects Releases Wiki Activity

re-add copy() method using try-with-resources

Browse Source
This commit is contained in:
Connor Tumbleson 2015-04-16 08:12:20 -05:00
parent 10afb3cd56
commit 7326867b09
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
View File

@ -409,8 +409,7 @@ public class Androlib {
if (apkOptions.forceBuildAll || isModified(newFiles(APK_RESOURCES_FILENAMES, appDir), if (apkOptions.forceBuildAll || isModified(newFiles(APK_RESOURCES_FILENAMES, appDir),
newFiles(APK_RESOURCES_FILENAMES, apkDir))) { newFiles(APK_RESOURCES_FILENAMES, apkDir))) {
LOGGER.info("Copying raw resources..."); LOGGER.info("Copying raw resources...");
appDir.getDirectory() appDir.getDirectory().copyToDir(apkDir, APK_RESOURCES_FILENAMES);
.copyToDir(apkDir, APK_RESOURCES_FILENAMES);
} }
return true; return true;
} catch (DirectoryException ex) { } catch (DirectoryException ex) {
@ -482,7 +481,7 @@ public class Androlib {
File apkDir = new File(appDir, APK_DIRNAME); File apkDir = new File(appDir, APK_DIRNAME);
if (apkOptions.debugMode) { if (apkOptions.debugMode) {
mAndRes.remove_application_debug(new File(apkDir,"AndroidManifest.xml").getAbsolutePath()); mAndRes.remove_application_debug(new File(apkDir, "AndroidManifest.xml").getAbsolutePath());
} }
if (apkOptions.forceBuildAll || isModified(newFiles(APK_MANIFEST_FILENAMES, appDir), if (apkOptions.forceBuildAll || isModified(newFiles(APK_MANIFEST_FILENAMES, appDir),
@ -569,7 +568,7 @@ public class Androlib {
try ( try (
ZipFile inputFile = new ZipFile(tempFile); ZipFile inputFile = new ZipFile(tempFile);
ZipOutputStream actualOutput = new ZipOutputStream(new FileOutputStream(outFile)); ZipOutputStream actualOutput = new ZipOutputStream(new FileOutputStream(outFile))
) { ) {
copyExistingFiles(inputFile, actualOutput); copyExistingFiles(inputFile, actualOutput);
copyUnknownFiles(appDir, actualOutput, files); copyUnknownFiles(appDir, actualOutput, files);
@ -587,17 +586,14 @@ public class Androlib {
Enumeration<? extends ZipEntry> entries = inputFile.entries(); Enumeration<? extends ZipEntry> entries = inputFile.entries();
while (entries.hasMoreElements()) { while (entries.hasMoreElements()) {
ZipEntry entry = new ZipEntry(entries.nextElement()); ZipEntry entry = new ZipEntry(entries.nextElement());
// We can't reuse the compressed size because it depends on compression sizes. // We can't reuse the compressed size because it depends on compression sizes.
entry.setCompressedSize(-1); entry.setCompressedSize(-1);
outputFile.putNextEntry(entry); outputFile.putNextEntry(entry);
// No need to create directory entries in the final apk // No need to create directory entries in the final apk
if (!entry.isDirectory()) { if (! entry.isDirectory()) {
try ( BrutIO.copy(inputFile, outputFile, entry);
InputStream is = inputFile.getInputStream(entry)
){
IOUtils.copy(is, outputFile);
}
} }
outputFile.closeEntry(); outputFile.closeEntry();
@ -611,32 +607,26 @@ public class Androlib {
// loop through unknown files // loop through unknown files
for (Map.Entry<String,String> unknownFileInfo : files.entrySet()) { for (Map.Entry<String,String> unknownFileInfo : files.entrySet()) {
File inputFile = new File(unknownFileDir, unknownFileInfo.getKey()); File inputFile = new File(unknownFileDir, unknownFileInfo.getKey());
if(inputFile.isDirectory()) { if (inputFile.isDirectory()) {
continue; continue;
} }
ZipEntry newEntry = new ZipEntry(unknownFileInfo.getKey()); ZipEntry newEntry = new ZipEntry(unknownFileInfo.getKey());
int method = Integer.valueOf(unknownFileInfo.getValue()); int method = Integer.valueOf(unknownFileInfo.getValue());
LOGGER.fine(String.format("Copying unknown file %s with method %d", unknownFileInfo.getKey(), method)); LOGGER.fine(String.format("Copying unknown file %s with method %d", unknownFileInfo.getKey(), method));
if(method == ZipEntry.STORED) { if (method == ZipEntry.STORED) {
newEntry.setMethod(ZipEntry.STORED); newEntry.setMethod(ZipEntry.STORED);
newEntry.setSize(inputFile.length()); newEntry.setSize(inputFile.length());
newEntry.setCompressedSize(-1); newEntry.setCompressedSize(-1);
BufferedInputStream unknownFile = new BufferedInputStream(new FileInputStream(inputFile)); BufferedInputStream unknownFile = new BufferedInputStream(new FileInputStream(inputFile));
CRC32 crc = BrutIO.calculateCrc(unknownFile); CRC32 crc = BrutIO.calculateCrc(unknownFile);
newEntry.setCrc(crc.getValue()); newEntry.setCrc(crc.getValue());
LOGGER.fine("\tsize: " + newEntry.getSize());
} else { } else {
newEntry.setMethod(ZipEntry.DEFLATED); newEntry.setMethod(ZipEntry.DEFLATED);
} }
outputFile.putNextEntry(newEntry); outputFile.putNextEntry(newEntry);
try ( BrutIO.copy(inputFile, outputFile);
FileInputStream fis = new FileInputStream(inputFile)
){
IOUtils.copy(fis, outputFile);
}
outputFile.closeEntry(); outputFile.closeEntry();
} }
} }

19
brut.j.util/src/main/java/brut/util/BrutIO.java
View File

@ -18,6 +18,9 @@ package brut.util;
import java.io.*; import java.io.*;
import java.util.zip.CRC32; import java.util.zip.CRC32;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
@ -70,4 +73,20 @@ public class BrutIO {
return crc; return crc;
} }
public static void copy(File inputFile, ZipOutputStream outputFile) throws IOException {
try (
FileInputStream fis = new FileInputStream(inputFile)
) {
IOUtils.copy(fis, outputFile);
}
}
public static void copy(ZipFile inputFile, ZipOutputStream outputFile, ZipEntry entry) throws IOException {
try (
InputStream is = inputFile.getInputStream(entry)
) {
IOUtils.copy(is, outputFile);
}
}
} }