From d2fc74d984098a1645e323df2dd6fb6243727acb Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Fri, 15 Nov 2013 13:07:07 -0600
Subject: [PATCH] remove jre7 code from testing class, added comments for
 manifest changing

---
 .../brut/androlib/res/AndrolibResources.java  | 15 ++++---
 .../brut/androlib/BuildAndDecodeTest.java     | 43 ++++++++-----------
 2 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
index d948725e..22742062 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
@@ -275,14 +275,15 @@ final public class AndrolibResources {
             fileDecoder.decodeManifest(inApk, "AndroidManifest.xml", out,
                     "AndroidManifest.xml");
 
-            // fix package (Android 4.2)
-            adjust_package_manifest(resTable, outDir.getAbsolutePath()
-                    + File.separator + "AndroidManifest.xml");
-
             // Remove versionName / versionCode (aapt API 16)
-            if (resTable.getAnalysisMode() == false) {
-                remove_manifest_versions(outDir.getAbsolutePath()
-                        + File.separator + "AndroidManifest.xml");
+            if (!resTable.getAnalysisMode()) {
+
+                // check for a mismatch between resources.arsc package and the package listed in AndroidManifest
+                // also remove the android::versionCode / versionName from manifest for rebuild
+                // this is a required change to prevent aapt warning about conflicting versions
+                // it will be passed as a parameter to aapt like "--min-sdk-version" via apktool.yml
+                adjust_package_manifest(resTable, outDir.getAbsolutePath() + File.separator + "AndroidManifest.xml");
+                remove_manifest_versions(outDir.getAbsolutePath() + File.separator + "AndroidManifest.xml");
             }
             if (inApk.containsDir("res")) {
                 in = inApk.getDir("res");
diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
index 329a8c86..f2b4c3e0 100644
--- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
@@ -17,11 +17,14 @@ package brut.androlib;
 
 import brut.androlib.res.util.ExtFile;
 import brut.common.BrutException;
+import brut.directory.FileDirectory;
 import brut.util.OS;
 import java.io.*;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
 import java.util.logging.Logger;
 import org.custommonkey.xmlunit.*;
 import org.junit.*;
@@ -223,47 +226,37 @@ public class BuildAndDecodeTest {
 		return result;
 	}
 
-    private void compareBinaryFolder(String path, boolean res) throws BrutException, IOException {
+    private boolean compareBinaryFolder(String path, boolean res) throws BrutException, IOException {
 
         String tmp = "";
         if (res) {
             tmp = File.separatorChar + "res" + File.separatorChar;
         }
 
-        Files.walkFileTree(Paths.get(sTestOrigDir.toPath() + tmp +  path), new SimpleFileVisitor<Path>() {
+        FileDirectory fileDirectory = new FileDirectory(sTestOrigDir + tmp + path);
 
-            @Override
-            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+        Set<String> files = fileDirectory.getFiles(true);
+        for (String filename : files) {
+            File control = new File(filename);
 
-                // hacky fix - load test by changing name of control
-                File control = file.toFile();
-                File test =  new File(file.toString().replace("testapp-orig", "testapp-new"));
+            // hacky fix - load test by changing name of control
+            File test =  new File(control.toString().replace("testapp-orig", "testapp-new"));
 
-                if (test.isFile()) {
-                    if (control.hashCode() != test.hashCode()) {
-                        sResult = false;
-                        return FileVisitResult.TERMINATE;
-                    }
-                }   else {
-                    sResult = false;
-                    return FileVisitResult.TERMINATE;
+            if (test.isFile()) {
+                if (control.hashCode() != test.hashCode()) {
+                    return false;
                 }
-                return FileVisitResult.CONTINUE;
             }
-
-        });
+        }
+        return true;
     }
 
     private boolean compareResFolder(String path) throws BrutException, IOException {
-        sResult = true;
-        compareBinaryFolder(path, true);
-        return sResult;
+        return compareBinaryFolder(path, true);
     }
 
     private boolean compareLibsFolder(String path) throws BrutException, IOException {
-        sResult = true;
-        compareBinaryFolder(File.separatorChar + path,false);
-        return sResult;
+        return compareBinaryFolder(File.separatorChar + path,false);
     }
 
 	private void compareValuesFiles(String path) throws BrutException {
@@ -313,8 +306,6 @@ public class BuildAndDecodeTest {
 	private static ExtFile sTestOrigDir;
 	private static ExtFile sTestNewDir;
 
-    private static boolean sResult;
-
 	private final static Logger LOGGER = Logger
 			.getLogger(BuildAndDecodeTest.class.getName());
 }