From 8fd7dcd425465806f5f6ad42a4fb496baffe560b Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 14 Oct 2020 16:53:59 +0200 Subject: [PATCH] always use androguard version of common.get_apk_id() first This removes the need for common.use_androguard() --- fdroidserver/common.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 32ca62bc..ca88fee2 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -2431,15 +2431,12 @@ def get_apk_id(apkfile): :returns: triplet (appid, version code, version name) """ - if use_androguard(): - try: - return get_apk_id_androguard(apkfile) - except zipfile.BadZipFile as e: - logging.error(apkfile + ': ' + str(e)) - if 'aapt' in config: - return get_apk_id_aapt(apkfile) - else: - return get_apk_id_aapt(apkfile) + try: + return get_apk_id_androguard(apkfile) + except zipfile.BadZipFile as e: + logging.error(apkfile + ': ' + str(e)) + if 'aapt' in config: + return get_apk_id_aapt(apkfile) def get_apk_id_androguard(apkfile):