From: Izzy <izzysoft@qumran.org>
Date: Wed, 17 Jan 2018 15:48:08 +0000 (+0100)
Subject: simplifying fix for "cannot identify image file" with XML icons
X-Git-Tag: 1.0.1~36^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=42ac65e8aa72499d0c46e2407a330f44ed3ccd46;p=fdroidserver.git

simplifying fix for "cannot identify image file" with XML icons
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index c5fa27df..60fedfee 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1470,15 +1470,9 @@ def extract_apk_icons(icon_filename, apk, apkzip, repo_dir):
             del apk['icons_src'][density]
             empty_densities.append(density)
 
-    if '-1' in apk['icons_src']:
+    if '-1' in apk['icons_src'] and not apk['icons_src']['-1'].endswith('.xml'):
         icon_src = apk['icons_src']['-1']
         icon_path = os.path.join(get_icon_dir(repo_dir, '0'), icon_filename)
-        if icon_src.endswith('.xml'):
-            for f in apkzip.namelist():
-                if f.endswith(png):
-                    m = re.match(r'res/(drawable|mipmap)-(x*[hlm]dpi).*/', f)
-                    if m:
-                        icon_src = f
         with open(icon_path, 'wb') as f:
             f.write(get_icon_bytes(apkzip, icon_src))
         im = None