Skip to content

fix crash on ios LogMessage #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix crash on ios LogMessage #950

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e38b207
fix message log crash.
hamidmalek Jun 30, 2025
72a2ec5
Update LogMessage.kt
hamidmalek Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 39 additions & 10 deletions kable-core/src/appleMain/kotlin/logs/LogMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,50 @@ internal fun LogMessage.detail(error: NSError?) {
if (error != null) detail("error", error.toString())
}

internal fun LogMessage.detail(service: CBService) {
detail("service", service.UUID.UUIDString)
private fun LogMessage.detail(service: CBService? = null) {
detail("service", service?.UUID?.UUIDString ?: "null UUID")
}

internal fun LogMessage.detail(characteristic: CBCharacteristic) {
detail(
characteristic.service!!.UUID.toUuid(),
characteristic.UUID.toUuid(),
)
private fun LogMessage.detail(characteristic: CBCharacteristic) {
val serviceUuid = characteristic.service
?.UUID
?.toUuid()
if (serviceUuid == null) {
detail("service", "null UUID")
return
}

detail(serviceUuid, characteristic.UUID.toUuid())
}

internal fun LogMessage.detail(descriptor: CBDescriptor) {
private fun LogMessage.detail(descriptor: CBDescriptor) {
val characteristic = descriptor.characteristic
if (characteristic == null) {
detail("characteristic", "null UUID")
return
}

val serviceUuid = characteristic.service
?.UUID
?.toUuid()

if (serviceUuid == null) {
detail("service", "null UUID")
return
}

detail(
descriptor.characteristic!!.service!!.UUID.toUuid(),
descriptor.characteristic!!.UUID.toUuid(),
serviceUuid,
characteristic.UUID.toUuid(),
descriptor.UUID.toUuid(),
)
}

internal fun LogMessage.detail(attribute: CBAttribute) {
when (attribute) {
is CBService -> detail(attribute)
is CBCharacteristic -> detail(attribute)
is CBDescriptor -> detail(attribute)
else -> detail("unknown attribute", attribute.UUID.toUuid())
}
}
Loading