From 89d4c6aed648684605a681b45d54176cb800ded5 Mon Sep 17 00:00:00 2001 From: "Felix C. Stegerman" Date: Tue, 20 Oct 2020 19:01:10 +0200 Subject: [PATCH] android: call non-static methods on .mActivity --- .../recipes/android/src/android/loadingscreen.py | 4 ++-- .../recipes/android/src/android/permissions.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pythonforandroid/recipes/android/src/android/loadingscreen.py b/pythonforandroid/recipes/android/src/android/loadingscreen.py index 962aa5c719..a18162e06f 100644 --- a/pythonforandroid/recipes/android/src/android/loadingscreen.py +++ b/pythonforandroid/recipes/android/src/android/loadingscreen.py @@ -5,5 +5,5 @@ def hide_loading_screen(): - python_activity = autoclass(ACTIVITY_CLASS_NAME) - python_activity.removeLoadingScreen() + mActivity = autoclass(ACTIVITY_CLASS_NAME).mActivity + mActivity.removeLoadingScreen() diff --git a/pythonforandroid/recipes/android/src/android/permissions.py b/pythonforandroid/recipes/android/src/android/permissions.py index 17d2a27902..9d78a6ec68 100644 --- a/pythonforandroid/recipes/android/src/android/permissions.py +++ b/pythonforandroid/recipes/android/src/android/permissions.py @@ -487,8 +487,8 @@ class _RequestPermissionsManager: def register_callback(cls): """Register Java callback for requestPermissions.""" cls._java_callback = _onRequestPermissionsCallback(cls.python_callback) - python_activity = autoclass(ACTIVITY_CLASS_NAME) - python_activity.addPermissionsCallback(cls._java_callback) + mActivity = autoclass(ACTIVITY_CLASS_NAME).mActivity + mActivity.addPermissionsCallback(cls._java_callback) @classmethod def request_permissions(cls, permissions, callback=None): @@ -511,12 +511,12 @@ def request_permissions(cls, permissions, callback=None): with cls._lock: if not cls._java_callback: cls.register_callback() - python_activity = autoclass(ACTIVITY_CLASS_NAME) + mActivity = autoclass(ACTIVITY_CLASS_NAME).mActivity if not callback: - python_activity.requestPermissions(permissions) + mActivity.requestPermissions(permissions) else: cls._callback_id += 1 - python_activity.requestPermissionsWithRequestCode( + mActivity.requestPermissionsWithRequestCode( permissions, cls._callback_id) cls._callbacks[cls._callback_id] = callback @@ -586,8 +586,8 @@ def check_permission(permission): Returns: bool: True if the app holds the permission given, False otherwise. """ - python_activity = autoclass(ACTIVITY_CLASS_NAME) - result = bool(python_activity.checkCurrentPermission( + mActivity = autoclass(ACTIVITY_CLASS_NAME).mActivity + result = bool(mActivity.checkCurrentPermission( permission + "" )) return result