Merge branch 'BurgerZ-patch-2'

This commit is contained in:
Connor Tumbleson 2016-01-06 12:50:13 -06:00
commit 2b2441b405

View File

@ -161,7 +161,7 @@ public class Androlib {
} }
} }
public void recordUncompressedFiles(ExtFile apkFile, Collection<String> uncompressedExtensions) throws AndrolibException { public void recordUncompressedFiles(ExtFile apkFile, Collection<String> uncompressedFilesOrExts) throws AndrolibException {
try { try {
Directory unk = apkFile.getDirectory(); Directory unk = apkFile.getDirectory();
Set<String> files = unk.getFiles(true); Set<String> files = unk.getFiles(true);
@ -171,9 +171,11 @@ public class Androlib {
if (isAPKFileNames(file) && !NO_COMPRESS_PATTERN.matcher(file).find()) { if (isAPKFileNames(file) && !NO_COMPRESS_PATTERN.matcher(file).find()) {
if (unk.getCompressionLevel(file) == 0) { if (unk.getCompressionLevel(file) == 0) {
ext = FilenameUtils.getExtension(file); ext = FilenameUtils.getExtension(file);
if (ext.isEmpty()) {
if (! uncompressedExtensions.contains(ext)) { ext = file;
uncompressedExtensions.add(FilenameUtils.getExtension(file)); }
if (! uncompressedFilesOrExts.contains(ext)) {
uncompressedFilesOrExts.add(ext);
} }
} }
} }