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 ba0a6763..f12fe5cb 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 @@ -478,9 +478,17 @@ public class Androlib { ninePatch, null, parseUsesFramework(usesFramework)); Directory tmpDir = new ExtFile(apkFile).getDirectory(); - tmpDir.copyToDir(apkDir, - tmpDir.containsDir("res") ? APK_RESOURCES_FILENAMES - : APK_RESOURCES_WITHOUT_RES_FILENAMES); + + // Sometimes an application is built with a resources.arsc file with no resources, + // Apktool assumes it will have a rebuilt arsc file, when it doesn't. So if we + // encounter a copy error, move to a warning and continue on. (#1730) + try { + tmpDir.copyToDir(apkDir, + tmpDir.containsDir("res") ? APK_RESOURCES_FILENAMES + : APK_RESOURCES_WITHOUT_RES_FILENAMES); + } catch (DirectoryException ex) { + LOGGER.warning(ex.getMessage()); + } // delete tmpDir apkFile.delete(); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/EmptyResourcesArscTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/EmptyResourcesArscTest.java new file mode 100644 index 00000000..337b9e9e --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/EmptyResourcesArscTest.java @@ -0,0 +1,72 @@ +/** + * Copyright (C) 2018 Ryszard Wiśniewski + * Copyright (C) 2018 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 EmptyResourcesArscTest { + @BeforeClass + public static void beforeClass() throws Exception { + TestUtils.cleanFrameworkFile(); + sTmpDir = new ExtFile(OS.createTempDirectory()); + sTestOrigDir = new ExtFile(sTmpDir, "issue1730-orig"); + sTestNewDir = new ExtFile(sTmpDir, "issue1730-new"); + LOGGER.info("Unpacking issue1730.apk..."); + TestUtils.copyResourceDir(EmptyResourcesArscTest.class, "brut/apktool/issue1730", sTestOrigDir); + + File testApk = new File(sTestOrigDir, "issue1730.apk"); + + LOGGER.info("Decoding issue1730.apk..."); + ApkDecoder apkDecoder = new ApkDecoder(testApk); + apkDecoder.setOutDir(sTestNewDir); + apkDecoder.decode(); + + LOGGER.info("Building issue1730.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(EmptyResourcesArscTest.class.getName()); +} \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1730/issue1730.apk b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1730/issue1730.apk new file mode 100644 index 00000000..45a38efe Binary files /dev/null and b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1730/issue1730.apk differ