fix: support COMPACT/OFFSET16 packed resources. (#3372)

* fix: support COMPACT/OFFSET16

* fix: properly read specNamesId from compact resources

* fix: properly read OFFSET16 in entries

* test: add assertions for compact/offset16 sample

* refactor: extract flags out of private functions

brut.apktool/apktool-lib/src/test/java/brut/androlib/BaseTest.java

@@ -22,6 +22,7 @@ import brut.directory.ExtFile;
 import brut.directory.FileDirectory;
 import org.custommonkey.xmlunit.*;
 import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -155,6 +156,17 @@ public class BaseTest {
         }
     }
 
+    protected static int getStringEntryCount(Document doc, String key) {
+        int count = 0;
+        Element resources = doc.getDocumentElement();
+        for (int i = 0; i < resources.getChildNodes().getLength(); i++) {
+            if (resources.getChildNodes().item(i).getNodeName().equals(key)) {
+                count++;
+            }
+        }
+        return count;
+    }
+
     protected static ExtFile sTmpDir;
     protected static ExtFile sTestOrigDir;
     protected static ExtFile sTestNewDir;

brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/CompactResourceTest.java

@@ -0,0 +1,67 @@
+/*
+ *  Copyright (C) 2010 Ryszard Wiśniewski <brut.alll@gmail.com>
+ *  Copyright (C) 2010 Connor Tumbleson <connor.tumbleson@gmail.com>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package brut.androlib.decode;
+
+import brut.androlib.*;
+import brut.directory.ExtFile;
+import brut.common.BrutException;
+import brut.util.OS;
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.*;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import static org.junit.Assert.*;
+
+public class CompactResourceTest extends BaseTest {
+
+    @BeforeClass
+    public static void beforeClass() throws Exception {
+        TestUtils.cleanFrameworkFile();
+        sTmpDir = new ExtFile(OS.createTempDirectory());
+        TestUtils.copyResourceDir(CompactResourceTest.class, "decode/issue3366/", sTmpDir);
+    }
+
+    @AfterClass
+    public static void afterClass() throws BrutException {
+        OS.rmdir(sTmpDir);
+    }
+
+    @Test
+    public void checkIfDecodeSucceeds() throws BrutException, IOException, ParserConfigurationException, SAXException {
+        String apk = "issue3366.apk";
+        File testApk = new File(sTmpDir, apk);
+
+        // decode issue3366.apk
+        ApkDecoder apkDecoder = new ApkDecoder(testApk);
+        sTestOrigDir = new ExtFile(sTmpDir + File.separator + apk + ".out");
+
+        File outDir = new File(sTmpDir + File.separator + apk + ".out");
+        apkDecoder.decode(outDir);
+
+        Document doc = loadDocument(new File(sTestOrigDir + "/res/values/strings.xml"));
+        assertEquals(1002, getStringEntryCount(doc, "string"));
+
+        Config config = Config.getDefaultConfig();
+        LOGGER.info("Building duplicatedex.apk...");
+        new ApkBuilder(config, sTestOrigDir).build(testApk);
+    }
+}