Android: fix 'Descriptor None was not found!' (#1580)

vabt-igd · web-flow · commit d45ec90d3cca · 2024-05-23T17:32:16.000-05:00
The keys in the descriptor dict are the normalized 128-bit UUID string, so we need to use this to correctly find the descriptor. Fixes #823
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -19,6 +19,7 @@ Fixed
 -----
 * Fixed ``discovered_devices_and_advertisement_data`` returning devices that should
   be filtered out by service UUIDs. Fixes #1576.
+* Fixed a ``Descriptor None was not found!`` exception occurring in ``start_notify()`` on Android. Fixes #823.
 
 `0.22.1`_ (2024-05-07)
 ======================
diff --git a/bleak/backends/p4android/defs.py b/bleak/backends/p4android/defs.py
@@ -5,6 +5,7 @@
 from jnius import autoclass, cast
 
 import bleak.exc
+from bleak.uuids import normalize_uuid_16
 
 # caching constants avoids unnecessary extra use of the jni-python interface, which can be slow
 
@@ -87,4 +88,4 @@ class ScanFailed(enum.IntEnum):
     BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE: "write-without-response",
 }
 
-CLIENT_CHARACTERISTIC_CONFIGURATION_UUID = "2902"
+CLIENT_CHARACTERISTIC_CONFIGURATION_UUID = normalize_uuid_16(0x2902)

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`from jnius import autoclass, cast`
`6`	`6`
`7`	`7`	`import bleak.exc`
	`8`	`+from bleak.uuids import normalize_uuid_16`
`8`	`9`
`9`	`10`	`# caching constants avoids unnecessary extra use of the jni-python interface, which can be slow`
`10`	`11`
`@@ -87,4 +88,4 @@ class ScanFailed(enum.IntEnum):`
`87`	`88`	`BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE: "write-without-response",`
`88`	`89`	`}`
`89`	`90`
`90`		`-CLIENT_CHARACTERISTIC_CONFIGURATION_UUID = "2902"`
	`91`	`+CLIENT_CHARACTERISTIC_CONFIGURATION_UUID = normalize_uuid_16(0x2902)`