From 7326867b09e937dc865e0aa0640b9bff0053706c Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Thu, 16 Apr 2015 08:12:20 -0500
Subject: [PATCH] re-add copy() method using try-with-resources

---
 .../src/main/java/brut/androlib/Androlib.java | 28 ++++++-------------
 .../src/main/java/brut/util/BrutIO.java       | 19 +++++++++++++
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
index abbc5645..8b4a9b4b 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
@@ -409,8 +409,7 @@ public class Androlib {
             if (apkOptions.forceBuildAll || isModified(newFiles(APK_RESOURCES_FILENAMES, appDir),
                     newFiles(APK_RESOURCES_FILENAMES, apkDir))) {
                 LOGGER.info("Copying raw resources...");
-                appDir.getDirectory()
-                        .copyToDir(apkDir, APK_RESOURCES_FILENAMES);
+                appDir.getDirectory().copyToDir(apkDir, APK_RESOURCES_FILENAMES);
             }
             return true;
         } catch (DirectoryException ex) {
@@ -482,7 +481,7 @@ public class Androlib {
             File apkDir = new File(appDir, APK_DIRNAME);
 
             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),
@@ -569,7 +568,7 @@ public class Androlib {
 
             try (
                     ZipFile inputFile = new ZipFile(tempFile);
-                    ZipOutputStream actualOutput = new ZipOutputStream(new FileOutputStream(outFile));
+                    ZipOutputStream actualOutput = new ZipOutputStream(new FileOutputStream(outFile))
             ) {
                 copyExistingFiles(inputFile, actualOutput);
                 copyUnknownFiles(appDir, actualOutput, files);
@@ -587,17 +586,14 @@ public class Androlib {
         Enumeration<? extends ZipEntry> entries = inputFile.entries();
         while (entries.hasMoreElements()) {
             ZipEntry entry = new ZipEntry(entries.nextElement());
+
             // We can't reuse the compressed size because it depends on compression sizes.
             entry.setCompressedSize(-1);
             outputFile.putNextEntry(entry);
 
             // No need to create directory entries in the final apk
-            if (!entry.isDirectory()) {
-                try (
-                        InputStream is = inputFile.getInputStream(entry)
-                        ){
-                    IOUtils.copy(is, outputFile);
-                }
+            if (! entry.isDirectory()) {
+                BrutIO.copy(inputFile, outputFile, entry);
             }
 
             outputFile.closeEntry();
@@ -611,32 +607,26 @@ public class Androlib {
         // loop through unknown files
         for (Map.Entry<String,String> unknownFileInfo : files.entrySet()) {
             File inputFile = new File(unknownFileDir, unknownFileInfo.getKey());
-            if(inputFile.isDirectory()) {
+            if (inputFile.isDirectory()) {
                 continue;
             }
 
             ZipEntry newEntry = new ZipEntry(unknownFileInfo.getKey());
             int method = Integer.valueOf(unknownFileInfo.getValue());
             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.setSize(inputFile.length());
                 newEntry.setCompressedSize(-1);
                 BufferedInputStream unknownFile = new BufferedInputStream(new FileInputStream(inputFile));
                 CRC32 crc = BrutIO.calculateCrc(unknownFile);
                 newEntry.setCrc(crc.getValue());
-
-                LOGGER.fine("\tsize: " + newEntry.getSize());
             } else {
                 newEntry.setMethod(ZipEntry.DEFLATED);
             }
             outputFile.putNextEntry(newEntry);
 
-            try (
-                 FileInputStream fis = new FileInputStream(inputFile)
-                    ){
-                IOUtils.copy(fis, outputFile);
-            }
+            BrutIO.copy(inputFile, outputFile);
             outputFile.closeEntry();
         }
     }
diff --git a/brut.j.util/src/main/java/brut/util/BrutIO.java b/brut.j.util/src/main/java/brut/util/BrutIO.java
index 70a72122..4022a1f9 100644
--- a/brut.j.util/src/main/java/brut/util/BrutIO.java
+++ b/brut.j.util/src/main/java/brut/util/BrutIO.java
@@ -18,6 +18,9 @@ package brut.util;
 
 import java.io.*;
 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;
 
@@ -70,4 +73,20 @@ public class BrutIO {
         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);
+        }
+    }
+
 }