ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-12-05 02:22:55 +01:00
Code Issues Projects Releases Wiki Activity

Ampersand in "<" gets replaced with "&" in plural strings

Browse Source
This commit is contained in:
Jeremy Hornberger 2015-03-01 00:28:03 -06:00 committed by Connor Tumbleson
parent bd566f2670
commit 5076612c87
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -60,6 +60,7 @@ v2.0.0 (TBA)
-Fixed (issue #757) - Download gradle binaries over https -Fixed (issue #757) - Download gradle binaries over https
-Fixed (issue #402) - Fix issues when running user has no access to $HOME. -Fixed (issue #402) - Fix issues when running user has no access to $HOME.
-Fixed (issue #761) - Added proper support for BCP47 localization tags -Fixed (issue #761) - Added proper support for BCP47 localization tags
-Fixed (issue #658) - Fixes Ampersand in "<" gets replaced with "&" in plural strings
-Fixed issue with attempting to decode .spi files as 9 patches (Thanks Furniel) -Fixed issue with attempting to decode .spi files as 9 patches (Thanks Furniel)
-Fixed issue with APKs with multiple dex files. -Fixed issue with APKs with multiple dex files.
-Fixed issue with using Apktool without smali/baksmali for ApktoolProperties (Thanks teprrr) -Fixed issue with using Apktool without smali/baksmali for ApktoolProperties (Thanks teprrr)

11
brut.apktool/apktool-lib/src/main/java/org/xmlpull/mxp1_serializer/MXSerializer.java
View File

@ -1009,10 +1009,13 @@ public class MXSerializer implements XmlSerializer {
} }
} else { } else {
if (ch == '&') { if (ch == '&') {
if (i > pos) if(!(i < text.length() - 3 && text.charAt(i+1) == 'l'
out.write(text.substring(pos, i)); && text.charAt(i+2) == 't' && text.charAt(i+3) == ';')){
out.write("&amp;"); if (i > pos)
pos = i + 1; out.write(text.substring(pos, i));
out.write("&amp;");
pos = i + 1;
}
} else if (ch == '<') { } else if (ch == '<') {
if (i > pos) if (i > pos)
out.write(text.substring(pos, i)); out.write(text.substring(pos, i));

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

@ -16,4 +16,7 @@
<item quantity="other">foo %d</item> <item quantity="other">foo %d</item>
<item quantity="one">foo 1</item> <item quantity="one">foo 1</item>
</plurals> </plurals>
<plurals name="issue658">
<item quantity="one">&lt;b>%d&lt;/b> guide123</item>
</plurals>
</resources> </resources>