ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-02-13 04:16:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MarcMil-master'

Browse Source
This commit is contained in:
Connor Tumbleson 2017-06-28 10:09:29 -04:00
commit b45054e65e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java
View File

@ -35,12 +35,13 @@ public class ResResSpec {
this.mId = id; this.mId = id;
String cleanName; String cleanName;
try { ResResSpec resResSpec = type.getResSpecUnsafe(name);
ResResSpec resResSpec = type.getResSpec(name); if (resResSpec != null) {
cleanName = name + "_APKTOOL_DUPLICATENAME_" + id.toString(); cleanName = name + "_APKTOOL_DUPLICATENAME_" + id.toString();
} catch (AndrolibException ex) { } else {
cleanName = (name.isEmpty() ? ("APKTOOL_DUMMYVAL_" + id.toString()) : name); cleanName = (name.isEmpty() ? ("APKTOOL_DUMMYVAL_" + id.toString()) : name);
} }
this.mName = cleanName; this.mName = cleanName;
this.mPackage = pkg; this.mPackage = pkg;
this.mType = type; this.mType = type;

6
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java
View File

@ -62,13 +62,17 @@ public final class ResTypeSpec {
} }
public ResResSpec getResSpec(String name) throws AndrolibException { public ResResSpec getResSpec(String name) throws AndrolibException {
ResResSpec spec = mResSpecs.get(name); ResResSpec spec = getResSpecUnsafe(name);
if (spec == null) { if (spec == null) {
throw new UndefinedResObject(String.format("resource spec: %s/%s", getName(), name)); throw new UndefinedResObject(String.format("resource spec: %s/%s", getName(), name));
} }
return spec; return spec;
} }
public ResResSpec getResSpecUnsafe(String name) {
return mResSpecs.get(name);
}
public void removeResSpec(ResResSpec spec) throws AndrolibException { public void removeResSpec(ResResSpec spec) throws AndrolibException {
mResSpecs.remove(spec.getName()); mResSpecs.remove(spec.getName());
} }