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

AXmlResourceParser::getAttributeValue(): do not use raw value for references and styles.

Browse Source
This commit is contained in:
Ryszard Wiśniewski 2011-05-03 03:51:51 +02:00
parent 855f664d40
commit 76d8aa0abc
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
View File

@ -306,15 +306,15 @@ public class AXmlResourceParser implements XmlResourceParser {
public String getAttributeValue(int index) { public String getAttributeValue(int index) {
int offset = getAttributeOffset(index); int offset = getAttributeOffset(index);
int valueString = m_attributes[offset + ATTRIBUTE_IX_VALUE_STRING];
if (valueString != -1) {
return AndrolibResources.escapeTextForResXml(
m_strings.getString(valueString));
}
int valueType = m_attributes[offset + ATTRIBUTE_IX_VALUE_TYPE]; int valueType = m_attributes[offset + ATTRIBUTE_IX_VALUE_TYPE];
int valueData = m_attributes[offset + ATTRIBUTE_IX_VALUE_DATA]; int valueData = m_attributes[offset + ATTRIBUTE_IX_VALUE_DATA];
int valueString = m_attributes[offset + ATTRIBUTE_IX_VALUE_STRING];
if (mAttrDecoder != null) { if (mAttrDecoder != null && (
valueString == -1
|| valueType == TypedValue.TYPE_REFERENCE
|| valueType == TypedValue.TYPE_ATTRIBUTE
)) {
try { try {
return mAttrDecoder.decode(valueType, valueData, return mAttrDecoder.decode(valueType, valueData,
getAttributeNameResource(index)); getAttributeNameResource(index));
@ -329,6 +329,11 @@ public class AXmlResourceParser implements XmlResourceParser {
} }
} }
if (valueString != -1) {
return AndrolibResources.escapeTextForResXml(
m_strings.getString(valueString));
}
return TypedValue.coerceToString(valueType, valueData); return TypedValue.coerceToString(valueType, valueData);
} }