mirror of
https://github.com/revanced/Apktool.git
synced 2025-01-05 17:45:52 +01:00
Support for applications with an empty resources.arsc file
- fixes #1730
This commit is contained in:
parent
17bad5a9bd
commit
34a2d03b31
@ -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();
|
||||
|
@ -0,0 +1,72 @@
|
||||
/**
|
||||
* Copyright (C) 2018 Ryszard Wiśniewski <brut.alll@gmail.com>
|
||||
* Copyright (C) 2018 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
|
||||
*
|
||||
* 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 <connor.tumbleson@gmail.com>
|
||||
*/
|
||||
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());
|
||||
}
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user