From 00471847c5b4b10087fc9cc919fcf357c325edde Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 12 Jun 2013 15:20:58 +0100
Subject: [PATCH 1/5] add google-play-services and crittercism to scanner

---
 fdroidserver/common.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 9eb9e9e2..2077e870 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1443,6 +1443,8 @@ def scan_source(build_dir, root_dir, thisbuild):
                       'admob-sdk-android',
                       'googleadview',
                       'googleadmobadssdk',
+		      'google-play-services',
+		      'crittercism',
                       'heyzap',
                       'jpct-ae']
 

From 182fd08cf4e4f5578feaa4637e8750323b87f0d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 13 Jun 2013 09:37:42 +0200
Subject: [PATCH 2/5] Remove tabs from previous commit

---
 fdroidserver/common.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 2077e870..85ccef88 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1443,8 +1443,8 @@ def scan_source(build_dir, root_dir, thisbuild):
                       'admob-sdk-android',
                       'googleadview',
                       'googleadmobadssdk',
-		      'google-play-services',
-		      'crittercism',
+                      'google-play-services',
+                      'crittercism',
                       'heyzap',
                       'jpct-ae']
 

From 3f7b6b8734beda9fb878638f58a0f5dfe897ec8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 14 Jun 2013 08:42:43 +0200
Subject: [PATCH 3/5] Allow extra fields in real name string

---
 fdroidserver/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 85ccef88..c14e766a 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -876,7 +876,7 @@ def fetch_real_name(app_dir):
     if name.startswith('@string/'):
         id = name[8:]
         name2 = None
-        string_search= re.compile(r'.*"'+id+'">([^<]+?)<.*').search
+        string_search= re.compile(r'.*"'+id+'".*>([^<]+?)<.*').search
         for xmlfile in glob.glob(os.path.join(
                 app_dir, 'res', 'values', 'strings*.xml')):
             for line in file(xmlfile):

From d1ef217895b52b09919a9419bde67b9ae4b90101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 14 Jun 2013 10:06:22 +0200
Subject: [PATCH 4/5] Only match label of the first application element

---
 fdroidserver/common.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index c14e766a..35d2551f 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -864,14 +864,20 @@ def description_html(lines,linkres):
 
 # Retrieve the package name
 def fetch_real_name(app_dir):
+    app_search = re.compile(r'.*<application.*').search
     name_search = re.compile(r'.*android:label="([^"]+)".*').search
+    app_found = False
     name = None
     for line in file(os.path.join(app_dir, 'AndroidManifest.xml')):
-        if name is not None:
-            break
-        matches = name_search(line)
-        if matches:
-            name = matches.group(1)
+        if not app_found:
+            if app_search(line):
+                app_found = True
+        else:
+            if name is not None:
+                break
+            matches = name_search(line)
+            if matches:
+                name = matches.group(1)
 
     if name.startswith('@string/'):
         id = name[8:]

From 304412dee549341e287c989c3db4d9e0c9238ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 14 Jun 2013 10:09:23 +0200
Subject: [PATCH 5/5] Never use @string/* as Auto Name

---
 fdroidserver/common.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 35d2551f..c02cda95 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -893,10 +893,10 @@ def fetch_real_name(app_dir):
                     name2 = matches.group(1)
         if name2 is not None:
             return name2
+        return ''
 
-    if name is not None:
+    else:
         return name
-    return ''
 
 # Extract some information from the AndroidManifest.xml at the given path.
 # Returns (version, vercode, package), any or all of which might be None.