From e7ee8cb178bfe4a455e40eda765ffb6c36754a87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= <brut.alll@gmail.com>
Date: Sat, 11 May 2013 17:59:12 +0200
Subject: [PATCH] Decode "%d %" with formatted="false". It's not necessary for
 current aapt, but it's more consistent with "%d % ".

---
 .../src/main/java/brut/androlib/res/xml/ResXmlEncoders.java     | 1 +
 .../brut/apktool/testapp/res/values-mcc001/strings.xml          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java
index ec1d7afe..1c847a0c 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java
@@ -175,6 +175,7 @@ public final class ResXmlEncoders {
 		while ((pos = str.indexOf('%', pos2)) != -1) {
             pos2 = pos + 1;
 			if (pos2 == length) {
+                nonPositional.add(pos);
 				break;
 			}
 			char c = str.charAt(pos2++);
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/strings.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/strings.xml
index 6beed51c..cb0e70a2 100644
--- a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/strings.xml
+++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/strings.xml
@@ -17,7 +17,7 @@ bar"</string>
     <string name="test_string16">foo<b>bar<i>"b
         az"</i></b>foo</string>
     <string name="test_string17" formatted="false">%d of %d</string>
-    <string name="test_string18">foo %d bar %</string>
+    <string name="test_string18" formatted="false">foo %d bar %</string>
     <string name="test_string19">%2$s foo %1$d</string>
     <string name="test_string20" formatted="false">%-e foo %,d</string>
     <string name="test_string21">%2$-e foo %1$,d</string>