Skip to content

Commit be60f76

Browse files
committed
fix message log crash.
print something instead of return.
1 parent b6653eb commit be60f76

File tree

1 file changed

+28
-8
lines changed

1 file changed

+28
-8
lines changed

kable-core/src/appleMain/kotlin/logs/LogMessage.kt

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,41 @@ internal fun LogMessage.detail(error: NSError?) {
1919
if (error != null) detail("error", error.toString())
2020
}
2121

22-
internal fun LogMessage.detail(service: CBService) {
23-
detail("service", service.UUID.UUIDString)
22+
internal fun LogMessage.detail(service: CBService? = null) {
23+
detail("service", service?.UUID?.UUIDString ?: "Unknown UUID")
2424
}
2525

2626
internal fun LogMessage.detail(characteristic: CBCharacteristic) {
27-
detail(
28-
characteristic.service!!.UUID.toUuid(),
29-
characteristic.UUID.toUuid(),
30-
)
27+
val serviceUuid = characteristic.service
28+
?.UUID
29+
?.toUuid()
30+
if (serviceUuid == null) {
31+
detail("service", "Unknown")
32+
return
33+
}
34+
35+
detail(serviceUuid, characteristic.UUID.toUuid())
3136
}
3237

3338
internal fun LogMessage.detail(descriptor: CBDescriptor) {
39+
val characteristic = descriptor.characteristic
40+
if (characteristic == null) {
41+
detail("characteristic", "Unknown")
42+
return
43+
}
44+
45+
val serviceUuid = characteristic.service
46+
?.UUID
47+
?.toUuid()
48+
49+
if (serviceUuid == null) {
50+
detail("service", "Unknown")
51+
return
52+
}
53+
3454
detail(
35-
descriptor.characteristic!!.service!!.UUID.toUuid(),
36-
descriptor.characteristic!!.UUID.toUuid(),
55+
serviceUuid,
56+
characteristic.UUID.toUuid(),
3757
descriptor.UUID.toUuid(),
3858
)
3959
}

0 commit comments

Comments
 (0)