ReVanced/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-05-02 06:54:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

decoder: Extend "keep-broken-res" to also ignore duplicate resources

Browse Source
This commit is contained in:
Christopher R. Palmer 2016-02-15 11:13:49 -05:00
parent b29df52b87
commit 4a02f5321c
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
View File

@ -73,6 +73,8 @@ public class ApkDecoder {
public void decode() throws AndrolibException, IOException, DirectoryException { public void decode() throws AndrolibException, IOException, DirectoryException {
File outDir = getOutDir(); File outDir = getOutDir();
AndrolibResources.sKeepBroken = mKeepBrokenResources;
if (!mForceDelete && outDir.exists()) { if (!mForceDelete && outDir.exists()) {
throw new OutDirExistsException(); throw new OutDirExistsException();
} }
@ -239,7 +241,6 @@ public class ApkDecoder {
throw new AndrolibException( throw new AndrolibException(
"Apk doesn't contain either AndroidManifest.xml file or resources.arsc file"); "Apk doesn't contain either AndroidManifest.xml file or resources.arsc file");
} }
AndrolibResources.sKeepBroken = mKeepBrokenResources;
mResTable = mAndrolib.getResTable(mApkFile, hasResources); mResTable = mAndrolib.getResTable(mApkFile, hasResources);
} }
return mResTable; return mResTable;

14
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
View File

@ -249,8 +249,18 @@ public class ARSCDecoder {
} }
ResResource res = new ResResource(mType, spec, value); ResResource res = new ResResource(mType, spec, value);
mType.addResource(res); try {
spec.addResource(res); mType.addResource(res);
spec.addResource(res);
} catch (AndrolibException e) {
if (mKeepBroken) {
mType.addResource(res, true);
spec.addResource(res, true);
System.err.println("ignoring exception: " + e);
} else {
throw e;
}
}
mPkg.addResource(res); mPkg.addResource(res);
} }