Merge branch 'master' into 'master'

two update parsing fixes  when using androguard

See merge request fdroid/fdroidserver!477

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index c22ac0f32b70d6add7f64a2367a24ef0e6091761..af731dd1d045febecf4a3b45975ee4401f06fef8 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -60,6 +60,7 @@ APK_PERMISSION_PAT = \
 APK_FEATURE_PAT = re.compile(".*name='([^']*)'.*")
 
 screen_densities = ['65534', '640', '480', '320', '240', '160', '120']
+# resolutions must end with 'dpi'
 screen_resolutions = {
     "xxxhdpi": '640',
     "xxhdpi": '480',
@@ -67,7 +68,7 @@ screen_resolutions = {
     "hdpi": '240',
     "mdpi": '160',
     "ldpi": '120',
-    "undefined": '-1',
+    "undefineddpi": '-1',
     "anydpi": '65534',
     "nodpi": '65535'
 }
@@ -1090,12 +1091,12 @@ def _get_apk_icons_src(apkfile, icon_name):
             m = density_re.match(filename)
             if m:
                 folder = m.group(1).split('-')
-                if len(folder) > 1:
+                if len(folder) > 1 and folder[1].endswith('dpi'):
                     density = screen_resolutions[folder[1]]
                 else:
                     density = '160'
                 icons_src[density] = m.group(0)
-    if icons_src.get('-1') is None:
+    if icons_src.get('-1') is None and '160' in icons_src:
         icons_src['-1'] = icons_src['160']
     return icons_src
 
@@ -1223,9 +1224,11 @@ def scan_apk_androguard(apk, apkfile):
     if apkobject.get_target_sdk_version() is not None:
         apk['targetSdkVersion'] = apkobject.get_target_sdk_version()
 
-    icon_id = int(apkobject.get_element("application", "icon").replace("@", "0x"), 16)
-    icon_name = arsc.get_id(apk['packageName'], icon_id)[1]
-    apk['icons_src'] = _get_apk_icons_src(apkfile, icon_name)
+    icon_id_str = apkobject.get_element("application", "icon")
+    if icon_id_str:
+        icon_id = int(icon_id_str.replace("@", "0x"), 16)
+        icon_name = arsc.get_id(apk['packageName'], icon_id)[1]
+        apk['icons_src'] = _get_apk_icons_src(apkfile, icon_name)
 
     arch_re = re.compile("^lib/(.*)/.*$")
     arch = set([arch_re.match(file).group(1) for file in apkobject.get_files() if arch_re.match(file)])
@@ -1262,7 +1265,10 @@ def scan_apk_androguard(apk, apkfile):
         apk['uses-permission-sdk-23'].append(permission_sdk_23)
 
     for item in xml.findall('uses-feature'):
-        feature = str(item.attrib['{' + xml.nsmap['android'] + '}name'])
+        key = '{' + xml.nsmap['android'] + '}name'
+        if key not in item.attrib:
+            continue
+        feature = str(item.attrib[key])
         if feature != "android.hardware.screen.portrait" \
                 and feature != "android.hardware.screen.landscape":
             if feature.startswith("android.feature."):

diff --git a/tests/SpeedoMeterApp.main_1.apk b/tests/SpeedoMeterApp.main_1.apk
new file mode 100644 (file)
index 0000000..2ce7b36
Binary files /dev/null and b/tests/SpeedoMeterApp.main_1.apk differ

diff --git a/tests/update.TestCase b/tests/update.TestCase
index 2e9b687ba170c8681e071c9fb027fb99f53d41d7..03391c181369ed50f3f132aba104ed957e1a4471 100755 (executable)
--- a/tests/update.TestCase
+++ b/tests/update.TestCase
@@ -333,6 +333,9 @@ class UpdateTest(unittest.TestCase):
                                                  '320': 'res/drawable-xhdpi-v4/icon.png',
                                                  '-1': 'res/drawable-mdpi-v4/icon.png'})
 
+        apk_info = fdroidserver.update.scan_apk('SpeedoMeterApp.main_1.apk')
+        self.assertEqual(apk_info['icons_src'], {})
+
     def test_scan_apk_no_sig(self):
         config = dict()
         fdroidserver.common.fill_config_defaults(config)