fixes unknown files being ignored if prefixed with known file

iBotPeaches · Feb 16, 2014 · 65b188a · 65b188a
1 parent f130c99
commit 65b188a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -34,6 +34,7 @@ v2.0.0 (TBA)
 -Fixed (issue #238) - Fixed truncated UTF-16 strings
 -Fixed (issue #584) - Fixed horrible spacing, aligned for 4 spaces.
 -Fixed (issue #196) - Fixed style crash due to malformed styles.
+-Fixed (issue #603) - Fixed unknown files prefixed with common name from being ignored.
 -Fixed issue with non-URI standard characters in apk name (Thanks rover12421)
 -Added output to list Apktool version to help debugging.
 -Updated known bytes for configurations to 38 (from addition of layout direction)

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
@@ -137,7 +137,7 @@ public void decodeRawFiles(ExtFile apkFile, File outDir)
 
     private boolean isAPKFileNames(String file) {
         for (String apkFile : APK_STANDARD_ALL_FILENAMES) {
-            if (apkFile.equals(file) || file.startsWith(apkFile)) {
+            if (apkFile.equals(file) || file.startsWith(apkFile + "/")) {
                 return true;
             }
         }
@@ -146,7 +146,7 @@ private boolean isAPKFileNames(String file) {
 
     public void decodeUnknownFiles(ExtFile apkFile, File outDir, ResTable resTable)
             throws AndrolibException {
-        LOGGER.info("Copying unknown files/dir...");
+        LOGGER.info("Copying unknown files...");
         File unknownOut = new File(outDir, UNK_DIRNAME);
         ZipEntry invZipFile;