From 2aec8cbcbb4c7b351394aaa1d8b963dbf344881d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= <brut.alll@gmail.com>
Date: Wed, 28 Apr 2010 10:09:34 +0200
Subject: [PATCH] AndrolibResources.escapeForResXml(): proper escaping of
 whitespaces.

---
 src/brut/androlib/res/AndrolibResources.java | 51 +++++++++++++++++---
 1 file changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/brut/androlib/res/AndrolibResources.java b/src/brut/androlib/res/AndrolibResources.java
index 9583a2df..b62c198f 100644
--- a/src/brut/androlib/res/AndrolibResources.java
+++ b/src/brut/androlib/res/AndrolibResources.java
@@ -312,14 +312,51 @@ final public class AndrolibResources {
         if (value.isEmpty()) {
             return value;
         }
-        value = value.replace("'", "\\'");
-        value = value.replace("\"", "\\\"");
-        value = value.replace("\n", "\\n");
-        char c = value.charAt(0);
-        if (c == '@' || c == '#' || c == '?') {
-            return '\\' + value;
+
+        StringBuilder out = new StringBuilder(value.length() + 10);
+        char[] chars = value.toCharArray();
+
+        switch (chars[0]) {
+            case '@':
+            case '#':
+            case '?':
+                out.append('\\');
         }
-        return value;
+
+        boolean space = true;
+        for (int i = 0; i < chars.length; i++) {
+            char c = chars[i];
+
+            if (c == ' ') {
+                if (space) {
+                    out.append("\\u0020");
+                } else {
+                    out.append(c);
+                    space = true;
+                }
+                continue;
+            }
+
+            space = false;
+            switch (c) {
+                case '\\':
+                case '\'':
+                case '"':
+                    out.append('\\');
+                    break;
+                case '\n':
+                    out.append("\\n");
+                    continue;
+            }
+            out.append(c);
+        }
+
+        if (space) {
+            out.deleteCharAt(out.length() - 1);
+            out.append("\\u0020");
+        }
+
+        return out.toString();
     }
 
     private final static Logger LOGGER =