Skip to content

Commit d167a70

Browse files
authored
Add additional null checks to scanRecord (#527)
1 parent 8d66469 commit d167a70

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

packages/reactive_ble_mobile/android/src/main/kotlin/com/signify/hue/flutterreactiveble/ble/ReactiveBleClient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ open class ReactiveBleClient(private val context: Context) : BleClient {
8484
ScanInfo(result.bleDevice.macAddress, result.scanRecord.deviceName
8585
?: result.bleDevice.name ?: "",
8686
result.rssi,
87-
result.scanRecord.serviceData.mapKeys { it.key.uuid },
87+
result.scanRecord.serviceData?.mapKeys { it.key.uuid } ?: emptyMap(),
8888
result.scanRecord.serviceUuids?.map { it.uuid } ?: emptyList(),
8989
extractManufacturerData(result.scanRecord.manufacturerSpecificData))
9090
}

packages/reactive_ble_mobile/android/src/main/kotlin/com/signify/hue/flutterreactiveble/converters/ManufacturerDataConverter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package com.signify.hue.flutterreactiveble.converters
22

33
import android.util.SparseArray
44

5-
fun extractManufacturerData(manufacturerData: SparseArray<ByteArray>): ByteArray {
5+
fun extractManufacturerData(manufacturerData: SparseArray<ByteArray>?): ByteArray {
66
val rawData = mutableListOf<Byte>()
77

8-
if (manufacturerData.size() > 0) {
8+
if (manufacturerData != null && manufacturerData.size() > 0) {
99
val companyId = manufacturerData.keyAt(0)
1010
val payload = manufacturerData.get(companyId)
1111

0 commit comments

Comments
 (0)