From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 23 May 2014 07:47:11 +0000 (+0200)
Subject: Fall back to launchable-activity label if application has none
X-Git-Tag: 0.2~67
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=93a56e4f51c8c24cfa8ecb0649d2a69a0ba2d7c6;p=fdroidserver.git

Fall back to launchable-activity label if application has none

This fixes apps like MiniZip not having a name
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 4f9f1c82..ba3245bc 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -402,6 +402,8 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                         thisinfo['icons_src']['-1'] = match.group(1)
                 elif line.startswith("launchable-activity:"):
                     # Only use launchable-activity as fallback to application
+                    if not thisinfo['name']:
+                        thisinfo['name'] = re.match(label_pat, line).group(1)
                     if '-1' not in thisinfo['icons_src']:
                         match = re.match(icon_pat_nodpi, line)
                         if match: