Skip to content

Commit fba062a

Browse files
committed
fix: A bit of renaming, and removed a redundant GC-preventing attribute.
1 parent a0fbab6 commit fba062a

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

pythonforandroid/recipes/android/src/android/permissions.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ class Permission:
423423
)
424424

425425

426-
class onRequestPermissionsCallback(PythonJavaClass):
426+
class _onRequestPermissionsCallback(PythonJavaClass):
427427
"""Callback class for registering a Python callback from
428428
onRequestPermissionsResult in PythonActivity.
429429
"""
@@ -432,17 +432,17 @@ class onRequestPermissionsCallback(PythonJavaClass):
432432

433433
def __init__(self, func):
434434
self.func = func
435-
onRequestPermissionsCallback._java_callback = self
436435
super().__init__()
437436

438437
@java_method('(I[Ljava/lang/String;[I)V')
439-
def onRequestPermissionsResult(self, requestCode, permissions, grantResults):
438+
def onRequestPermissionsResult(self, requestCode,
439+
permissions, grantResults):
440440
self.func(requestCode, permissions, grantResults)
441441

442442

443-
class onRequestPermissionsManager:
444-
"""Class for requesting Android permissions via requestPermissions,
445-
including registering callbacks to requestPermissions.
443+
class _request_permissions_manager:
444+
"""Internal class for requesting Android permissions via
445+
requestPermissions, including registering callbacks to requestPermissions.
446446
447447
Permissions are requested through the method 'request_permissions' which
448448
accepts a list of permissions and an optional callback.
@@ -474,7 +474,7 @@ class onRequestPermissionsManager:
474474
@classmethod
475475
def register_callback(cls):
476476
"""Register Java callback for requestPermissions."""
477-
cls._java_callback = onRequestPermissionsCallback(cls.python_callback)
477+
cls._java_callback = _onRequestPermissionsCallback(cls.python_callback)
478478
python_activity = autoclass('org.kivy.android.PythonActivity')
479479
python_activity.addPermissionsCallback(cls._java_callback)
480480

@@ -505,9 +505,11 @@ def python_callback(cls, requestCode, permissions, grantResults):
505505
if cls._callbacks.get(requestCode):
506506
cls._callbacks[requestCode](permissions, grantResults)
507507

508+
# Public API methods for requesting permissions
509+
508510

509511
def request_permissions(permissions, callback=None):
510-
onRequestPermissionsManager.request_permissions(permissions, callback)
512+
_request_permissions_manager.request_permissions(permissions, callback)
511513

512514

513515
def request_permission(permission, callback=None):

0 commit comments

Comments
 (0)