Auto Names: handle escaped \' and nested strings

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index ebf23eb9666380a31ad06879e9bbe617eb60c29b..566284b3c5218ddd6cee675c589ffaa8fa59f0a4 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -868,7 +868,10 @@ def retrieve_string(app_dir, string_id):
         for line in file(xmlfile):
             matches = string_search(line)
             if matches:
-                return matches.group(1)
+                s = matches.group(1)
+                if s.startswith('@string/'):
+                    return retrieve_string(app_dir, s[8:]);
+                return s.replace("\\'","'")
     return ''
 
 # Retrieve the package name
@@ -890,9 +893,7 @@ def fetch_real_name(app_dir):
 
     if name.startswith('@string/'):
         return retrieve_string(app_dir, name[8:])
-
-    else:
-        return name
+    return name
 
 # Extract some information from the AndroidManifest.xml at the given path.
 # Returns (version, vercode, package), any or all of which might be None.