Closing Framework and APK after use

This commit should fix https://github.com/iBotPeaches/Apktool/issues/1160

brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java

@@ -187,6 +187,11 @@ public class Main {
         } catch (DirectoryException ex) {
             System.err.println("Could not modify internal dex files. Please ensure you have permission.");
             System.exit(1);
+        } finally {
+            try {
+                decoder.close();
+            } catch (IOException e) {
+            }
         }
 
     }

brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java

@@ -741,6 +741,10 @@ public class Androlib {
         return files;
     }
 
+    public void close() throws IOException {
+        mAndRes.close();
+    }
+
     private final static Logger LOGGER = Logger.getLogger(Androlib.class.getName());
 
     private final static String SMALI_DIRNAME = "smali";

brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java

@@ -60,6 +60,14 @@ public class ApkDecoder {
     }
 
     public void setApkFile(File apkFile) {
+        if (mApkFile != null)
+        {
+            try {
+                mApkFile.close();
+            } catch (IOException e) {
+            }
+        }
+
         mApkFile = new ExtFile(apkFile);
         mResTable = null;
     }
@@ -73,6 +81,7 @@ public class ApkDecoder {
     }
 
     public void decode() throws AndrolibException, IOException, DirectoryException {
+        try {
             File outDir = getOutDir();
             AndrolibResources.sKeepBroken = mKeepBrokenResources;
 
@@ -160,6 +169,12 @@ public class ApkDecoder {
             mAndrolib.recordUncompressedFiles(mApkFile, mUncompressedFiles);
             mAndrolib.writeOriginalFiles(mApkFile, outDir);
             writeMetaFile();
+        } finally {
+            try {
+                mApkFile.close();
+            } catch (IOException e) {
+            }
+        }
     }
 
     public void setDecodeSources(short mode) throws AndrolibException {
@@ -273,6 +288,10 @@ public class ApkDecoder {
         }
     }
 
+    public void close() throws IOException {
+        mAndrolib.close();
+    }
+
     public final static short DECODE_SOURCES_NONE = 0x0000;
     public final static short DECODE_SOURCES_SMALI = 0x0001;
 

brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java

@@ -121,7 +121,8 @@ final public class AndrolibResources {
         File apk = getFrameworkApk(id, frameTag);
 
         LOGGER.info("Loading resource table from file: " + apk);
-        ResPackage[] pkgs = getResPackagesFromApk(new ExtFile(apk), resTable, true);
+        mFramework = new ExtFile(apk);
+        ResPackage[] pkgs = getResPackagesFromApk(mFramework, resTable, true);
 
         ResPackage pkg;
         if (pkgs.length > 1) {
@@ -555,8 +556,16 @@ final public class AndrolibResources {
     private ResPackage[] getResPackagesFromApk(ExtFile apkFile,ResTable resTable, boolean keepBroken)
             throws AndrolibException {
         try {
-            BufferedInputStream bfi = new BufferedInputStream(apkFile.getDirectory().getFileInput("resources.arsc"));
+            Directory dir = apkFile.getDirectory();
+            BufferedInputStream bfi = new BufferedInputStream(dir.getFileInput("resources.arsc"));
+            try {
                 return ARSCDecoder.decode(bfi, false, keepBroken, resTable).getPackages();
+            } finally {
+                try {
+                    bfi.close();
+                } catch (IOException e) {
+                }
+            }
         } catch (DirectoryException ex) {
             throw new AndrolibException("Could not load resources.arsc from file: " + apkFile, ex);
         }
@@ -810,6 +819,10 @@ final public class AndrolibResources {
         }
     }
 
+    public void close() throws IOException {
+        mFramework.close();
+    }
+
     public ApkOptions apkOptions;
 
     // TODO: dirty static hack. I have to refactor decoding mechanisms.
@@ -819,6 +832,8 @@ final public class AndrolibResources {
 
     private File mFrameworkDirectory = null;
 
+    private ExtFile mFramework = null;
+
     private String mMinSdkVersion = null;
     private String mMaxSdkVersion = null;
     private String mTargetSdkVersion = null;

brut.j.dir/src/main/java/brut/directory/AbstractDirectory.java

@@ -17,6 +17,7 @@
 package brut.directory;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.LinkedHashMap;
@@ -235,6 +236,11 @@ public abstract class AbstractDirectory implements Directory {
         return dirs;
     }
 
+
+    public void close() throws IOException {
+
+    }
+
     private SubPath getSubPath(String path) throws PathNotExist {
         ParsedPath parsed = parsePath(path);
         if (parsed.dir == null) {

brut.j.dir/src/main/java/brut/directory/Directory.java

@@ -50,5 +50,8 @@ public interface Directory {
     public int getCompressionLevel(String fileName)
             throws DirectoryException;
 
+
+    public void close() throws IOException;
+    
     public final char separator = '/';
 }

brut.j.dir/src/main/java/brut/directory/ExtFile.java

@@ -17,6 +17,7 @@
 package brut.directory;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.URI;
 
 /**
@@ -54,5 +55,9 @@ public class ExtFile extends File {
         return mDirectory;
     }
 
+    public void close() throws IOException {
+        mDirectory.close();
+    }
+
     private Directory mDirectory;
 }

brut.j.dir/src/main/java/brut/directory/ZipRODirectory.java

@@ -151,4 +151,8 @@ public class ZipRODirectory extends AbstractDirectory {
         return mZipFile;
     }
 
+
+    public void close() throws IOException {
+        mZipFile.close();
+    }
 }