mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-08 10:21:05 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

update: switch to new androguard v3.1 API based on lxml

Browse source 
apkobject.get_android_manifest_xml() used to return a xml.dom.minidom
object, now it returns an lxml.etree.Element object.
This commit is contained in:
Hans-Christoph Steiner 2018-02-14 22:03:00 +01:00
parent 699b3e4c69
commit 5281228ea5
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
fdroidserver/update.py
View file

@ -1240,28 +1240,28 @@ def scan_apk_androguard(apk, apkfile):
xml = apkobject.get_android_manifest_xml() xml = apkobject.get_android_manifest_xml()
for item in xml.getElementsByTagName('uses-permission'): for item in xml.findall('uses-permission'):
name = str(item.getAttribute("android:name")) name = str(item.attrib['{' + xml.nsmap['android'] + '}name'])
maxSdkVersion = item.getAttribute("android:maxSdkVersion") maxSdkVersion = item.attrib.get('{' + xml.nsmap['android'] + '}maxSdkVersion')
maxSdkVersion = None if maxSdkVersion is '' else int(maxSdkVersion) maxSdkVersion = int(maxSdkVersion) if maxSdkVersion else None
permission = UsesPermission( permission = UsesPermission(
name, name,
maxSdkVersion maxSdkVersion
) )
apk['uses-permission'].append(permission) apk['uses-permission'].append(permission)
for item in xml.getElementsByTagName('uses-permission-sdk-23'): for item in xml.findall('uses-permission-sdk-23'):
name = str(item.getAttribute("android:name")) name = str(item.attrib['{' + xml.nsmap['android'] + '}name'])
maxSdkVersion = item.getAttribute("android:maxSdkVersion") maxSdkVersion = item.attrib.get('{' + xml.nsmap['android'] + '}maxSdkVersion')
maxSdkVersion = None if maxSdkVersion is '' else int(maxSdkVersion) maxSdkVersion = int(maxSdkVersion) if maxSdkVersion else None
permission_sdk_23 = UsesPermissionSdk23( permission_sdk_23 = UsesPermissionSdk23(
name, name,
maxSdkVersion maxSdkVersion
) )
apk['uses-permission-sdk-23'].append(permission_sdk_23) apk['uses-permission-sdk-23'].append(permission_sdk_23)
for item in xml.getElementsByTagName('uses-feature'): for item in xml.findall('uses-feature'):
feature = str(item.getAttribute("android:name")) feature = str(item.attrib['{' + xml.nsmap['android'] + '}name'])
if feature != "android.hardware.screen.portrait" \ if feature != "android.hardware.screen.portrait" \
and feature != "android.hardware.screen.landscape": and feature != "android.hardware.screen.landscape":
if feature.startswith("android.feature."): if feature.startswith("android.feature."):