From 88e24dc4e305e1e7476dfb23001bc40387f0de10 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 22 Feb 2018 13:39:41 +0100
Subject: [PATCH] update: switch to improved androguard detection

---
 fdroidserver/update.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 5b39e751..4d227dd4 100644
--- 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
-- 
2.30.2