diff --git a/fdroidserver/update.py b/fdroidserver/update.py index c22ac0f3..168ef31f 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -1223,9 +1223,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)]) diff --git a/tests/SpeedoMeterApp.main_1.apk b/tests/SpeedoMeterApp.main_1.apk new file mode 100644 index 00000000..2ce7b362 Binary files /dev/null and b/tests/SpeedoMeterApp.main_1.apk differ diff --git a/tests/update.TestCase b/tests/update.TestCase index 2e9b687b..03391c18 100755 --- 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)