From 65b188ae96611ae3e5d9383c963fe60f79a0e365 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Sun, 16 Feb 2014 11:20:06 -0600
Subject: [PATCH] fixes unknown files being ignored if prefixed with known file

---
 CHANGES                                                       | 1 +
 .../apktool-lib/src/main/java/brut/androlib/Androlib.java     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index df4d589815..a58c8a92c4 100644
--- 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
index 3f2cba2ccf..95185606d6 100644
--- 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;