fixes unknown files being ignored if prefixed with known file

This commit is contained in:
Connor Tumbleson 2014-02-16 11:20:06 -06:00
parent f130c995fb
commit 65b188ae96
2 changed files with 3 additions and 2 deletions

View File

@ -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)

View File

@ -137,7 +137,7 @@ public class Androlib {
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 @@ public class Androlib {
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;