add permissions request method

hbldh · Oct 2, 2024 · 2431e60 · 2431e60
1 parent 3393c46
commit 2431e60
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 26 deletions.
diff --git a/bleak/__init__.py b/bleak/__init__.py
@@ -325,6 +325,15 @@ async def discover(
 
         return scanner.discovered_devices
 
+    async def request_permissions(self, **kwargs) -> None:
+        """
+        Request permissions for the BleakScanner.
+
+        Args:
+            **kwargs: Additional arguments to be passed to the :class:`BleakScanner` backend.
+        """
+        await self._backend.request_permissions(**kwargs)
+
     @property
     def discovered_devices(self) -> List[BLEDevice]:
         """

diff --git a/bleak/backends/p4android/scanner.py b/bleak/backends/p4android/scanner.py
@@ -13,7 +13,7 @@
 
 from android.broadcast import BroadcastReceiver
 from android.permissions import Permission, request_permissions
-from jnius import cast, java_method
+from jnius import cast, java_method, autoclass
 
 from ...exc import BleakError
 from ..scanner import AdvertisementData, AdvertisementDataCallback, BaseBleakScanner
@@ -61,6 +61,41 @@ def __init__(
     def __del__(self) -> None:
         self.__stop()
 
+    async def request_permissions(self, **kwargs) -> None:
+        loop = asyncio.get_running_loop()
+        permission_acknowledged = loop.create_future()
+        def handle_permissions(permissions, grantResults):
+            if any(grantResults):
+                loop.call_soon_threadsafe(
+                    permission_acknowledged.set_result, grantResults
+                )
+            else:
+                loop.call_soon_threadsafe(
+                    permission_acknowledged.set_exception(
+                        BleakError("User denied access to " + str(permissions))
+                    )
+                )
+        if not kwargs.get("permissions"):
+            permissions = [
+                Permission.ACCESS_FINE_LOCATION,
+                Permission.ACCESS_COARSE_LOCATION,
+                Permission.ACCESS_BACKGROUND_LOCATION,
+            ]
+            VERSION = autoclass('android.os.Build$VERSION')
+            if VERSION.SDK_INT >= 31:
+                permissions.extend([
+                    Permission.BLUETOOTH_SCAN,
+                    Permission.BLUETOOTH_CONNECT,
+                ])
+        else:
+            permissions = kwargs.get("permissions")
+
+        request_permissions(
+                permissions,
+                handle_permissions,
+            )
+        await permission_acknowledged
+
     async def start(self) -> None:
         if BleakScannerP4Android.__scanner is not None:
             raise BleakError("A BleakScanner is already scanning on this adapter.")
@@ -73,30 +108,6 @@ async def start(self) -> None:
             if self.__callback is None:
                 self.__callback = _PythonScanCallback(self, loop)
 
-            permission_acknowledged = loop.create_future()
-
-            def handle_permissions(permissions, grantResults):
-                if any(grantResults):
-                    loop.call_soon_threadsafe(
-                        permission_acknowledged.set_result, grantResults
-                    )
-                else:
-                    loop.call_soon_threadsafe(
-                        permission_acknowledged.set_exception(
-                            BleakError("User denied access to " + str(permissions))
-                        )
-                    )
-
-            request_permissions(
-                [
-                    Permission.ACCESS_FINE_LOCATION,
-                    Permission.ACCESS_COARSE_LOCATION,
-                    "android.permission.ACCESS_BACKGROUND_LOCATION",
-                ],
-                handle_permissions,
-            )
-            await permission_acknowledged
-
             self.__adapter = defs.BluetoothAdapter.getDefaultAdapter()
             if self.__adapter is None:
                 raise BleakError("Bluetooth is not supported on this hardware platform")

diff --git a/bleak/backends/scanner.py b/bleak/backends/scanner.py
@@ -307,6 +307,15 @@ def set_scanning_filter(self, **kwargs) -> None:
         """
         raise NotImplementedError()
 
+    @abc.abstractmethod
+    async def request_permissions(self, **kwargs) -> None:
+        """Request permissions for the BleakScanner.
+
+        Args:
+            **kwargs: Additional arguments to be passed to the :class:`BleakScanner` backend.
+        """
+        raise NotImplementedError()
+
 
 def get_platform_scanner_backend_type() -> Type[BaseBleakScanner]:
     """

diff --git a/examples/kivy/main.py b/examples/kivy/main.py
@@ -41,7 +41,9 @@ async def example(self):
         while self.running:
             try:
                 self.line("scanning")
-                scanned_devices = await bleak.BleakScanner.discover(1)
+                scanner = bleak.BleakScanner()
+                await scanner.request_permissions()
+                scanned_devices = scanner.discover(1)
                 self.line("scanned", True)
 
                 if len(scanned_devices) == 0: