Properly support escaped strings

See:
https://developer.android.com/guide/topics/resources/string-resource.html

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 33c89ea2d31208c159a64bc52f1ec26aaf49dea6..c2eb4388d93617ee3058fd4a3fc40b41bf1ff2c4 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -859,6 +859,13 @@ class vcs_bzr(vcs):
                 p.output.splitlines()]
 
 
+def unescape_string(string):
+    if string[0] == '"' and string[-1] == '"':
+        return string[1:-1]
+
+    return string.replace("\\'", "'")
+
+
 def retrieve_string(app_dir, string, xmlfiles=None):
 
     if xmlfiles is None:
@@ -872,7 +879,7 @@ def retrieve_string(app_dir, string, xmlfiles=None):
                     xmlfiles += [os.path.join(r, x) for x in f if x.endswith('.xml')]
 
     if not string.startswith('@string/'):
-        return string.replace("\\'", "'")
+        return unescape_string(string)
 
     name = string[len('@string/'):]