ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-07-11 08:04:05 +02:00
Code Issues Projects Releases Wiki Activity

Handle ResStringValue when ResAttr expected in ResStyleValue

Browse Source
This commit is contained in:
Jeff Smith 2014-10-18 23:26:08 -05:00 committed by Jeff Smith
parent 5bc76f197f
commit db2478a71f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java
View File

@ -52,14 +52,20 @@ public class ResStyleValue extends ResBagValue implements
}
for (int i = 0; i < mItems.length; i++) {
ResResSpec spec = mItems[i].m1.getReferent();
String name = null;
String value = null;
String resource = spec.getDefaultResource().getValue().toString();
// hacky-fix remove bad ReferenceVars
if (spec.getDefaultResource().getValue().toString()
.contains("ResReferenceValue@")) {
if (resource.contains("ResReferenceValue@")) {
continue;
} else if (resource.contains("ResStringValue@")) {
name = "@" + spec.getFullName(res.getResSpec().getPackage(), false);
} else {
ResAttr attr = (ResAttr) spec.getDefaultResource().getValue();
value = attr.convertToResXmlFormat(mItems[i].m2);
name = spec.getFullName(res.getResSpec().getPackage(), true);
}
ResAttr attr = (ResAttr) spec.getDefaultResource().getValue();
String value = attr.convertToResXmlFormat(mItems[i].m2);
if (value == null) {
value = mItems[i].m2.encodeAsResXmlValue();
@ -70,8 +76,7 @@ public class ResStyleValue extends ResBagValue implements
}
serializer.startTag(null, "item");
serializer.attribute(null, "name",
spec.getFullName(res.getResSpec().getPackage(), true));
serializer.attribute(null, "name", name);
serializer.text(value);
serializer.endTag(null, "item");
}