mirror/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2026-05-12 09:57:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

always use androguard version of common.get_apk_id() first

Browse Source 
This removes the need for common.use_androguard()
This commit is contained in:
Hans-Christoph Steiner
2020-10-14 16:53:59 +02:00
parent 27b90a13bf
commit 8fd7dcd425
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fdroidserver/common.py
View File

@@ -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):