Merge pull request #1770 from iBotPeaches/issue-1769

Correct compression type of AOSP default no-compress extensions

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

@@ -168,8 +168,7 @@ public class Androlib {
             String ext;
 
             for (String file : files) {
-                if (isAPKFileNames(file) && !NO_COMPRESS_PATTERN.matcher(file).find()) {
+                if (isAPKFileNames(file) && unk.getCompressionLevel(file) == 0) {
-                    if (unk.getCompressionLevel(file) == 0) {
 
                     if (StringUtils.countMatches(file, ".") > 1) {
                         ext = file;
@@ -180,12 +179,11 @@ public class Androlib {
                         }
                     }
 
-                        if (! uncompressedFilesOrExts.contains(ext)) {
+                    if (!uncompressedFilesOrExts.contains(ext)) {
                         uncompressedFilesOrExts.add(ext);
                     }
                 }
             }
-            }
         } catch (DirectoryException ex) {
             throw new AndrolibException(ex);
         }
@@ -789,9 +787,4 @@ public class Androlib {
     private final static String[] APK_STANDARD_ALL_FILENAMES = new String[] {
             "classes.dex", "AndroidManifest.xml", "resources.arsc", "res", "r", "R",
             "lib", "libs", "assets", "META-INF", "kotlin" };
-    // Taken from AOSP's frameworks/base/tools/aapt/Package.cpp
-    private final static Pattern NO_COMPRESS_PATTERN = Pattern.compile("\\.(" +
-            "jpg|jpeg|png|gif|wav|mp2|mp3|ogg|aac|mpg|mpeg|mid|midi|smf|jet|rtttl|imy|xmf|mp4|" +
-            "m4a|m4v|3gp|3gpp|3g2|3gpp2|amr|awb|wma|wmv|webm|mkv)$");
-
 }

brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java

@@ -173,6 +173,13 @@ public class BuildAndDecodeTest extends BaseTest {
         assertEquals(0x8888, aaaa.length());
     }
 
+    @Test
+    public void storedMp3FilesAreNotCompressedTest() throws BrutException {
+        ExtFile extFile = new ExtFile(sTmpDir, "testapp.apk");
+        Integer built = extFile.getDirectory().getCompressionLevel("res/raw/rain.mp3");
+        assertEquals(new Integer(0), built);
+    }
+
     @Test
     public void crossTypeTest() throws BrutException {
         compareValuesFiles("values-mcc003/strings.xml");

brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/apktool.yml

@@ -10,6 +10,10 @@ versionInfo:
   versionCode: '1'
   versionName: '1.0'
 compressionType: false
+doNotCompress:
+- arsc
+- png
+- mp3
 unknownFiles:
   hidden.file: '8'
   non\u007Fprintable.file: '8'