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

fix spacing & change warning message to use LOGGER

Browse Source
This commit is contained in:
Connor Tumbleson 2016-02-16 08:18:26 -05:00
parent 4a02f5321c
commit 52e9e8a4d7
2 changed files with 12 additions and 13 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

@ -72,8 +72,7 @@ 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;
AndrolibResources.sKeepBroken = mKeepBrokenResources;
if (!mForceDelete && outDir.exists()) { if (!mForceDelete && outDir.exists()) {
throw new OutDirExistsException(); throw new OutDirExistsException();

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

@ -250,17 +250,17 @@ public class ARSCDecoder {
ResResource res = new ResResource(mType, spec, value); ResResource res = new ResResource(mType, spec, value);
try { try {
mType.addResource(res); mType.addResource(res);
spec.addResource(res); spec.addResource(res);
} catch (AndrolibException e) { } catch (AndrolibException ex) {
if (mKeepBroken) { if (mKeepBroken) {
mType.addResource(res, true); mType.addResource(res, true);
spec.addResource(res, true); spec.addResource(res, true);
System.err.println("ignoring exception: " + e); LOGGER.warning(String.format("Duplicate Resource Detected. Ignoring duplicate: %s", res.toString()));
} else { } else {
throw e; throw ex;
} }
} }
mPkg.addResource(res); mPkg.addResource(res);
} }