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

Cleaned up the code related to multiple substitutions in xml strings.

Browse Source
This commit is contained in:
Ryszard Wiśniewski 2013-05-11 20:00:48 +02:00
parent e7ee8cb178
commit 14f26474e6
4 changed files with 4 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java
View File

@ -55,21 +55,7 @@ public class ResPluralsValue extends ResBagValue implements
serializer.startTag(null, "item"); serializer.startTag(null, "item");
serializer.attribute(null, "quantity", QUANTITY_MAP[i]); serializer.attribute(null, "quantity", QUANTITY_MAP[i]);
if (ResXmlEncoders.hasMultipleNonPositionalSubstitutions(rawValue serializer.text(ResXmlEncoders.enumerateNonPositionalSubstitutionsIfRequired(item.encodeAsResXmlValue()));
.encodeAsResXmlValue())) {
serializer.text(item.encodeAsResXmlValueExt());
} else {
String recode = item.encodeAsResXmlValue();
// Dirty, but working fix @miuirussia
for (int j = 0; j < 10; j++) {
recode = StringUtils.replace(
recode,
"%" + Integer.toString(j) + "$"
+ Integer.toString(j) + "$",
"%" + Integer.toString(j) + "$");
}
serializer.text(recode);
}
serializer.endTag(null, "item"); serializer.endTag(null, "item");
} }
serializer.endTag(null, "plurals"); serializer.endTag(null, "plurals");

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

@ -54,44 +54,13 @@ public abstract class ResScalarValue extends ResValue implements
if (mRawValue != null) { if (mRawValue != null) {
return mRawValue; return mRawValue;
} }
return encodeAsResXmlValueExt().replace("@android:", "@*android:"); return encodeAsResXml().replace("@android:", "@*android:");
} }
public String encodeAsResXmlNonEscapedItemValue() throws AndrolibException { public String encodeAsResXmlNonEscapedItemValue() throws AndrolibException {
return encodeAsResXmlValue().replace("@android:", "@*android:").replace("&amp;", "&").replace("&lt;","<"); return encodeAsResXmlValue().replace("@android:", "@*android:").replace("&amp;", "&").replace("&lt;","<");
} }
public String encodeAsResXmlValueExt() throws AndrolibException {
String rawValue = mRawValue;
if (rawValue != null) {
if (ResXmlEncoders.hasMultipleNonPositionalSubstitutions(rawValue)) {
int count = 1;
StringBuilder result = new StringBuilder();
String tmp1[] = rawValue.split("%%", -1);
int tmp1_sz = tmp1.length;
for (int i = 0; i < tmp1_sz; i++) {
String cur1 = tmp1[i];
String tmp2[] = cur1.split("%", -1);
int tmp2_sz = tmp2.length;
for (int j = 0; j < tmp2_sz; j++) {
String cur2 = tmp2[j];
result.append(cur2);
if (j != (tmp2_sz - 1)) {
result.append('%').append(count).append('$');
count++;
}
}
if (i != (tmp1_sz - 1)) {
result.append("%%");
}
}
rawValue = result.toString();
}
return rawValue;
}
return encodeAsResXml();
}
@Override @Override
public void serializeToResValuesXml(XmlSerializer serializer, public void serializeToResValuesXml(XmlSerializer serializer,
ResResource res) throws IOException, AndrolibException { ResResource res) throws IOException, AndrolibException {

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

@ -43,7 +43,7 @@ public class ResStringValue extends ResScalarValue {
@Override @Override
public String encodeAsResXmlItemValue() { public String encodeAsResXmlItemValue() {
return ResXmlEncoders return ResXmlEncoders
.enumerateNonPositionalSubstitutions(ResXmlEncoders .enumerateNonPositionalSubstitutionsIfRequired(ResXmlEncoders
.encodeAsXmlValue(mRawValue)); .encodeAsXmlValue(mRawValue));
} }

2
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java
View File

@ -140,7 +140,7 @@ public final class ResXmlEncoders {
return findSubstitutions(str, 2).m1.size() > 1; return findSubstitutions(str, 2).m1.size() > 1;
} }
public static String enumerateNonPositionalSubstitutions(String str) { public static String enumerateNonPositionalSubstitutionsIfRequired(String str) {
List<Integer> subs = findSubstitutions(str, -1).m1; List<Integer> subs = findSubstitutions(str, -1).m1;
if (subs.size() < 2) { if (subs.size() < 2) {
return str; return str;