@@ -19,21 +19,41 @@ internal fun LogMessage.detail(error: NSError?) {
19
19
if (error != null ) detail(" error" , error.toString())
20
20
}
21
21
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 " )
24
24
}
25
25
26
26
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())
31
36
}
32
37
33
38
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
+
34
54
detail(
35
- descriptor.characteristic !! .service !! . UUID .toUuid() ,
36
- descriptor. characteristic!! .UUID .toUuid(),
55
+ serviceUuid ,
56
+ characteristic.UUID .toUuid(),
37
57
descriptor.UUID .toUuid(),
38
58
)
39
59
}
0 commit comments