refactor: source and tests (#4071)

Author: IgorEisberg

brut.apktool/apktool-cli/build.gradle.kts

@@ -9,7 +9,6 @@ plugins {
 dependencies {
     implementation(project(":brut.apktool:apktool-lib"))
     implementation(libs.commons.cli)
-    implementation(libs.commons.io)
     r8(libs.r8)
 }
 

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

@@ -25,10 +25,8 @@
 import brut.androlib.exceptions.OutDirExistsException;
 import brut.androlib.res.AaptManager;
 import brut.androlib.res.Framework;
-import brut.directory.ExtFile;
 import brut.util.OSDetection;
 import org.apache.commons.cli.*;
-import org.apache.commons.io.IOUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -501,11 +499,8 @@ private static void cmdDecode(String[] args) throws AndrolibException {
                 : apkName + ".out");
         }
 
-        try (ExtFile apkFile = new ExtFile(apkName)) {
-            ApkDecoder decoder = new ApkDecoder(apkFile, config);
-            decoder.decode(outDir);
-        } catch (IOException ignored) {
-            // Input file could not be closed, just ignore.
+        try {
+            new ApkDecoder(new File(apkName), config).decode(outDir);
         } catch (InFileNotFoundException | OutDirExistsException | FrameworkNotFoundException ex) {
             System.err.println(ex.getMessage());
             System.exit(1);
@@ -581,9 +576,7 @@ private static void cmdBuild(String[] args) throws AndrolibException {
             }
         }
 
-        ExtFile apkDir = new ExtFile(apkDirName);
-        ApkBuilder builder = new ApkBuilder(apkDir, config);
-        builder.build(outFile);
+        new ApkBuilder(new File(apkDirName), config).build(outFile);
     }
 
     private static void cmdInstallFramework(String[] args) throws AndrolibException {
@@ -878,17 +871,13 @@ public String getBaksmaliVersion() {
         }
 
         private void load(Properties props, String name) {
-            InputStream in = null;
-            try {
-                in = Main.class.getResourceAsStream(name);
+            try (InputStream in = Main.class.getResourceAsStream(name)) {
                 if (in == null) {
                     throw new FileNotFoundException(name);
                 }
                 props.load(in);
             } catch (IOException ignored) {
-                System.out.println("Could not load " + name);
-            } finally {
-                IOUtils.closeQuietly(in);
+                System.err.println("Could not load resource: " + name);
             }
         }
     }