diff --git a/apktool-cli/pom.xml b/apktool-cli/pom.xml index 3f49ac3d..95fc4af4 100644 --- a/apktool-cli/pom.xml +++ b/apktool-cli/pom.xml @@ -4,7 +4,7 @@ brut.apktool apktool-cli - 1.4.5-SNAPSHOT + 1.4.6-SNAPSHOT jar diff --git a/apktool-lib/pom.xml b/apktool-lib/pom.xml index 42f407cf..665d9048 100644 --- a/apktool-lib/pom.xml +++ b/apktool-lib/pom.xml @@ -4,7 +4,7 @@ brut.apktool apktool-lib - 1.4.5-SNAPSHOT + 1.4.6-SNAPSHOT jar @@ -80,7 +80,7 @@ common 1.0 - + brut.apktool.smali smali ${smaliVersion} diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java index 1909b9a9..df0b12dd 100644 --- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java +++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java @@ -19,6 +19,7 @@ package brut.androlib.res.data.value; import brut.androlib.res.xml.ResValuesXmlSerializable; import brut.androlib.AndrolibException; import brut.androlib.res.data.ResResource; +import brut.androlib.res.xml.ResXmlEncoders; import brut.util.Duo; import java.io.IOException; import org.xmlpull.v1.XmlSerializer; @@ -50,13 +51,22 @@ public class ResPluralsValue extends ResBagValue implements ResValuesXmlSerializ } serializer.startTag(null, "item"); serializer.attribute(null, "quantity", QUANTITY_MAP[i]); - serializer.text(item.encodeAsResXmlValue()); + + String item2 = item.encodeAsResXmlValue(); + + /* + * peaches fix regarding formatted=false + */ + if (ResXmlEncoders.hasMultipleNonPositionalSubstitutions(item2)) { + serializer.attribute(null, "formatted", "false"); + } + serializer.text(item2); + serializer.endTag(null, "item"); } serializer.endTag(null, "plurals"); } - - + private final ResScalarValue[] mItems;