From 22bd5b0acc15abf9405028f473a7f14e3e16e954 Mon Sep 17 00:00:00 2001
From: Andrei Zhukouski <BurgerZ@users.noreply.github.com>
Date: Mon, 4 Jan 2016 13:15:54 +0300
Subject: [PATCH 1/2] Fixes issue #1122

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

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 15874860..23a036d6 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
@@ -171,9 +171,11 @@ public class Androlib {
                 if (isAPKFileNames(file) && !NO_COMPRESS_PATTERN.matcher(file).find()) {
                     if (unk.getCompressionLevel(file) == 0) {
                         ext = FilenameUtils.getExtension(file);
-
+                        if (ext.isEmpty()) {
+                            ext = file;
+                        }
                         if (! uncompressedExtensions.contains(ext)) {
-                            uncompressedExtensions.add(FilenameUtils.getExtension(file));
+                            uncompressedExtensions.add(ext);
                         }
                     }
                 }

From 0011498b52d9ec12919ef1ccbfa5a7abeda42e2f Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Wed, 6 Jan 2016 12:49:55 -0600
Subject: [PATCH 2/2] [skip] rename var to match extension or file without
 extension

---
 .../apktool-lib/src/main/java/brut/androlib/Androlib.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 23a036d6..b5f5e263 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
@@ -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 {
             Directory unk = apkFile.getDirectory();
             Set<String> files = unk.getFiles(true);
@@ -174,8 +174,8 @@ public class Androlib {
                         if (ext.isEmpty()) {
                             ext = file;
                         }
-                        if (! uncompressedExtensions.contains(ext)) {
-                            uncompressedExtensions.add(ext);
+                        if (! uncompressedFilesOrExts.contains(ext)) {
+                            uncompressedFilesOrExts.add(ext);
                         }
                     }
                 }