diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java index 41bb073c..3bb87613 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java @@ -139,12 +139,6 @@ public class ARSCDecoder { } } - private void resSparseTypeEntry() throws AndrolibException, IOException { - // uint_32_t - entry - int index = mIn.readInt(); - int offset = mIn.readInt(); - } - private ResTypeSpec readTableTypeSpec() throws AndrolibException, IOException { mTypeSpec = readSingleTableTypeSpec(); addTypeSpec(mTypeSpec); @@ -213,6 +207,10 @@ public class ARSCDecoder { if (position != mCountIn.getCount()) { mIn.skipBytes(position - mCountIn.getCount()); } + + if (typeFlags == 1) { + LOGGER.info("Sparse type flags detected: " + mTypeSpec.getName()); + } int[] entryOffsets = mIn.readIntArray(entryCount); if (flags.isInvalid) { @@ -226,11 +224,6 @@ public class ARSCDecoder { mType = flags.isInvalid && !mKeepBroken ? null : mPkg.getOrCreateConfig(flags); - if (typeFlags == 1) { - System.err.println("I don't have a parsed resource yet to test. So die out until I find one."); - System.exit(1); - } - for (int i = 0; i < entryOffsets.length; i++) { if (entryOffsets[i] != -1) { mMissingResSpecs[i] = false; diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/AndroidOreoNotSparseTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/AndroidOreoNotSparseTest.java new file mode 100644 index 00000000..4eb6eae4 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/AndroidOreoNotSparseTest.java @@ -0,0 +1,72 @@ +/** + * Copyright (C) 2017 Ryszard Wiśniewski + * Copyright (C) 2017 Connor Tumbleson + * + * 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 + * + * http://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; + +import brut.directory.ExtFile; +import brut.common.BrutException; +import brut.util.OS; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.File; +import java.util.logging.Logger; + +import static org.junit.Assert.assertTrue; + +/** + * @author Connor Tumbleson + */ +public class AndroidOreoNotSparseTest { + @BeforeClass + public static void beforeClass() throws Exception { + TestUtils.cleanFrameworkFile(); + sTmpDir = new ExtFile(OS.createTempDirectory()); + sTestOrigDir = new ExtFile(sTmpDir, "issue1594-orig"); + sTestNewDir = new ExtFile(sTmpDir, "issue1594-new"); + LOGGER.info("Unpacking not_sparse.apk..."); + TestUtils.copyResourceDir(AndroidOreoNotSparseTest.class, "brut/apktool/issue1594", sTestOrigDir); + + File testApk = new File(sTestOrigDir, "not_sparse.apk"); + + LOGGER.info("Decoding not_sparse.apk..."); + ApkDecoder apkDecoder = new ApkDecoder(testApk); + apkDecoder.setOutDir(sTestNewDir); + apkDecoder.decode(); + + LOGGER.info("Building not_sparse.apk..."); + ApkOptions apkOptions = new ApkOptions(); + new Androlib(apkOptions).build(sTestNewDir, testApk); + } + + @AfterClass + public static void afterClass() throws BrutException { + OS.rmdir(sTmpDir); + } + + @Test + public void buildAndDecodeTest() throws BrutException { + assertTrue(sTestNewDir.isDirectory()); + assertTrue(sTestOrigDir.isDirectory()); + } + + private static ExtFile sTmpDir; + private static ExtFile sTestOrigDir; + private static ExtFile sTestNewDir; + + private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName()); +} \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/AndroidOreoSparseTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/AndroidOreoSparseTest.java new file mode 100644 index 00000000..8c692b16 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/AndroidOreoSparseTest.java @@ -0,0 +1,77 @@ +/** + * Copyright (C) 2017 Ryszard Wiśniewski + * Copyright (C) 2017 Connor Tumbleson + * + * 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 + * + * http://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; + +import brut.directory.ExtFile; +import brut.common.BrutException; +import brut.util.OS; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.File; +import java.util.logging.Logger; + +import static org.junit.Assert.assertTrue; + +/** + * @author Connor Tumbleson + */ +public class AndroidOreoSparseTest { + @BeforeClass + public static void beforeClass() throws Exception { + TestUtils.cleanFrameworkFile(); + sTmpDir = new ExtFile(OS.createTempDirectory()); + sTestOrigDir = new ExtFile(sTmpDir, "issue1594-orig"); + sTestNewDir = new ExtFile(sTmpDir, "issue1594-new"); + LOGGER.info("Unpacking sparse.apk..."); + TestUtils.copyResourceDir(AndroidOreoNotSparseTest.class, "brut/apktool/issue1594", sTestOrigDir); + + File testApk = new File(sTestOrigDir, "sparse.apk"); + + LOGGER.info("Decoding sparse.apk..."); + ApkDecoder apkDecoder = new ApkDecoder(testApk); + apkDecoder.setOutDir(sTestNewDir); + apkDecoder.decode(); + + LOGGER.info("Building sparse.apk..."); + ApkOptions apkOptions = new ApkOptions(); + new Androlib(apkOptions).build(sTestNewDir, testApk); + } + + @AfterClass + public static void afterClass() throws BrutException { + OS.rmdir(sTmpDir); + } + + @Test + public void buildAndDecodeTest() throws BrutException { + assertTrue(sTestNewDir.isDirectory()); + assertTrue(sTestOrigDir.isDirectory()); + } + + @Test + public void ensureStringsOreoTest() throws BrutException { + assertTrue((new File(sTestNewDir, "res/values-v26/strings.xml").isFile())); + } + + private static ExtFile sTmpDir; + private static ExtFile sTestOrigDir; + private static ExtFile sTestNewDir; + + private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName()); +} \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1594/not_sparse.apk b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1594/not_sparse.apk new file mode 100644 index 00000000..599a370d Binary files /dev/null and b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1594/not_sparse.apk differ diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1594/sparse.apk b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1594/sparse.apk new file mode 100644 index 00000000..1f9bba31 Binary files /dev/null and b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1594/sparse.apk differ