android: call non-static methods on .mActivity (kivy#2341)

obfusk · web-flow · commit 03f26928dcea · 2020-10-28T21:20:21.000+01:00
diff --git 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
@@ -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
