ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-11-18 10:29:26 +01:00
Code Issues Projects Releases Wiki Activity

Prevent casting Strings/Styles to Attrs

Browse Source 
- refs #957, #1060
This commit is contained in:
Connor Tumbleson 2015-10-15 08:58:19 -05:00
parent 76a940628f
commit 3dea579f66
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ public class ResStyleValue extends ResBagValue implements
// hacky-fix remove bad ReferenceVars // hacky-fix remove bad ReferenceVars
if (resource.contains("ResReferenceValue@")) { if (resource.contains("ResReferenceValue@")) {
continue; continue;
} else if (resource.contains("ResStringValue@")) { } else if (resource.contains("ResStringValue@") || resource.contains("ResStyleValue@")) {
name = "@" + spec.getFullName(res.getResSpec().getPackage(), false); name = "@" + spec.getFullName(res.getResSpec().getPackage(), false);
} else { } else {
ResAttr attr = (ResAttr) spec.getDefaultResource().getValue(); ResAttr attr = (ResAttr) spec.getDefaultResource().getValue();

2
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java
View File

@ -39,7 +39,7 @@ public class ResAttrDecoder {
.getResSpec(attrResId).getDefaultResource().getValue(); .getResSpec(attrResId).getDefaultResource().getValue();
decoded = attr.convertToResXmlFormat(resValue); decoded = attr.convertToResXmlFormat(resValue);
} catch (UndefinedResObject ex) { } catch (UndefinedResObject | ClassCastException ex) {
// ignored // ignored
} }
} }