update: switch to improved androguard detection

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 5b39e751d0a3a9c143b7a0abd63bc3d1a714295d..4d227dd4c26c5930da6cacfaa88d3d10e9dda13e 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1049,11 +1049,9 @@ def scan_apk(apk_file):
         'antiFeatures': set(),
     }
 
-    try:
-        import androguard
-        androguard  # silence pyflakes
+    if common.use_androguard():
         scan_apk_androguard(apk, apk_file)
-    except ImportError:
+    else:
         scan_apk_aapt(apk, apk_file)
 
     # Get the signature, or rather the signing key fingerprints