Fix: some apks have a zip mimetype instead of a jar one

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 6af904ae0abbf33a20055d5588b8d9dd088c4bc0..e60cc6cab0a1f596a7759cf5c951d8cd22efd6c1 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1279,13 +1279,16 @@ def scan_source(build_dir, root_dir, thisbuild):
                 count += handleproblem('binary executable', fd, fp)
             elif mime == 'application/x-java-applet':
                 count += handleproblem('Java compiled class', fd, fp)
-            elif mime == 'application/jar' and has_extension(fp, 'apk'):
+            elif has_extension(fp, 'apk') and mime in (
+                    'application/jar',
+                    'application/zip',
+                    ):
                 removeproblem('APK file', fd, fp)
-            elif has_extension(fp, 'jar') and mime in [
+            elif has_extension(fp, 'jar') and mime in (
                     'application/zip',
                     'application/java-archive',
                     'binary',
-                    ]:
+                    ):
                 warnproblem('JAR file', fd)
             elif mime == 'application/zip':
                 warnproblem('ZIP file', fd)