Increased version to 1.4.6.

Fixed formatted=false error.
This commit is contained in:
Connor Tumbleson 2012-05-02 16:15:15 -05:00
parent 776a3b99c0
commit df7e469ff4
3 changed files with 16 additions and 6 deletions

View File

@ -4,7 +4,7 @@
<groupId>brut.apktool</groupId> <groupId>brut.apktool</groupId>
<artifactId>apktool-cli</artifactId> <artifactId>apktool-cli</artifactId>
<version>1.4.5-SNAPSHOT</version> <version>1.4.6-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>

View File

@ -4,7 +4,7 @@
<groupId>brut.apktool</groupId> <groupId>brut.apktool</groupId>
<artifactId>apktool-lib</artifactId> <artifactId>apktool-lib</artifactId>
<version>1.4.5-SNAPSHOT</version> <version>1.4.6-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>

View File

@ -19,6 +19,7 @@ package brut.androlib.res.data.value;
import brut.androlib.res.xml.ResValuesXmlSerializable; import brut.androlib.res.xml.ResValuesXmlSerializable;
import brut.androlib.AndrolibException; import brut.androlib.AndrolibException;
import brut.androlib.res.data.ResResource; import brut.androlib.res.data.ResResource;
import brut.androlib.res.xml.ResXmlEncoders;
import brut.util.Duo; import brut.util.Duo;
import java.io.IOException; import java.io.IOException;
import org.xmlpull.v1.XmlSerializer; import org.xmlpull.v1.XmlSerializer;
@ -50,13 +51,22 @@ public class ResPluralsValue extends ResBagValue implements ResValuesXmlSerializ
} }
serializer.startTag(null, "item"); serializer.startTag(null, "item");
serializer.attribute(null, "quantity", QUANTITY_MAP[i]); 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, "item");
} }
serializer.endTag(null, "plurals"); serializer.endTag(null, "plurals");
} }
private final ResScalarValue[] mItems; private final ResScalarValue[] mItems;