From d0b5e6036979b7e4a5219ea862f01db69d0f7916 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 4 Jun 2015 15:56:20 +0200 Subject: [PATCH] Properly support escaped strings See: https://developer.android.com/guide/topics/resources/string-resource.html --- fdroidserver/common.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 33c89ea2..c2eb4388 100644 --- 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/'):] -- 2.30.2