ReVanced/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-06-12 05:07:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevents double escaping of special chars in arrays.xml/<item> tags

Browse Source
This commit is contained in:
Connor Tumbleson
2013-05-05 08:13:32 -05:00
parent 1449c00f76
commit f93a312308
4 changed files with 8 additions and 1 deletions
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/ResArrayValue.java
View File

@ -58,7 +58,7 @@ public class ResArrayValue extends ResBagValue implements
serializer.attribute(null, "name", res.getResSpec().getName());
for (int i = 0; i < mItems.length; i++) {
serializer.startTag(null, "item");
serializer.text(mItems[i].encodeAsResXmlItemValue());
serializer.text(mItems[i].encodeAsResXmlNonEscapedItemValue());
serializer.endTag(null, "item");
}
serializer.endTag(null, type);

4
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
View File

@ -57,6 +57,10 @@ public abstract class ResScalarValue extends ResValue implements
return encodeAsResXmlValueExt().replace("@android:", "@*android:");
}
public String encodeAsResXmlNonEscapedItemValue() throws AndrolibException {
return encodeAsResXmlValue().replace("@android:", "@*android:").replace("&amp;", "&").replace("&lt;","<");
}
public String encodeAsResXmlValueExt() throws AndrolibException {
String rawValue = mRawValue;
if (rawValue != null) {

2
brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/arrays.xml
View File

@ -5,6 +5,8 @@
<item>TEST2</item>
<item>TEST3</item>
<item>%2$s foo %1$d</item>
<item>http://google.com&amp;boo=1&amp;foo=2</item>
<item>&lt;b>Bolded Text&lt;/b></item>
</string-array>
<integer-array name="test_array2">
<item>-1</item>