flutter/universal_ble
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve Android error handling

Browse Source
This commit is contained in:
Foti Dim
2024-07-03 09:00:52 +02:00
parent 8d0cfe98d9
commit 0070f5c002
1 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/kotlin/com/navideck/universal_ble/UniversalBlePlugin.kt
+24 -29
View File
@@ -161,19 +161,6 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
}
override fun disconnect(deviceId: String) {
// val currentState = devicesStateMap[deviceId]
// If `disconnect` is called before BluetoothGatt.STATE_CONNECTED or BluetoothGatt.STATE_CONNECTING
// there will be no `disconnected` message any more from callback
// if (currentState != null && currentState != BluetoothGatt.STATE_CONNECTED) {
// Log.e(TAG, "$deviceId Already disconnected or disconnecting")
// mainThreadHandler?.post {
// callbackChannel?.onConnectionChanged(
// deviceId,
// BleConnectionState.Disconnected.value
// ) {}
// }
// return
//}
cleanConnection(deviceId.toBluetoothGatt())
}
@@ -188,11 +175,23 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
deviceId: String,
callback: (Result<List<UniversalBleService>>) -> Unit,
) {
if (!deviceId.toBluetoothGatt().discoverServices()) {
callback(Result.failure(FlutterError("Failed", "Failed to discover services", null)))
return
try {
if (!deviceId.toBluetoothGatt().discoverServices()) {
callback(
Result.failure(
FlutterError(
"Failed",
"Failed to discover services",
null
)
)
)
return
}
discoverServicesFutureList.add(DiscoverServicesFuture(deviceId, callback))
} catch (e: FlutterError) {
callback(Result.failure(e))
}
discoverServicesFutureList.add(DiscoverServicesFuture(deviceId, callback))
}
override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) {
@@ -459,9 +458,13 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
override fun requestMtu(deviceId: String, expectedMtu: Long, callback: (Result<Long>) -> Unit) {
val gatt = deviceId.toBluetoothGatt()
gatt.requestMtu(expectedMtu.toInt())
mtuResultFutureList.add(MtuResultFuture(deviceId, callback))
try {
val gatt = deviceId.toBluetoothGatt()
gatt.requestMtu(expectedMtu.toInt())
mtuResultFutureList.add(MtuResultFuture(deviceId, callback))
} catch (e: FlutterError) {
callback(Result.failure(e))
}
}
override fun onMtuChanged(gatt: BluetoothGatt?, mtu: Int, status: Int) {
@@ -893,12 +896,4 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
override fun onDetachedFromActivityForConfigChanges() {}
override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {}
}
}