let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: adjust android talk parser for kotlin json

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-29 23:26:38 +01:00
parent 20d7882033
commit 3c338d1858
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkDirectiveParser.kt
View File

@@ -162,30 +162,27 @@ object TalkDirectiveParser {
} }
} }
private fun JsonElement?.asStringOrNull(): String? = (this as? JsonPrimitive)?.contentOrNull private fun JsonElement?.asStringOrNull(): String? =
(this as? JsonPrimitive)?.takeIf { it.isString }?.content
private fun JsonElement?.asDoubleOrNull(): Double? { private fun JsonElement?.asDoubleOrNull(): Double? {
val primitive = this as? JsonPrimitive ?: return null val primitive = this as? JsonPrimitive ?: return null
if (primitive.isString) return primitive.content.toDoubleOrNull() return primitive.content.toDoubleOrNull()
return primitive.doubleOrNull
} }
private fun JsonElement?.asIntOrNull(): Int? { private fun JsonElement?.asIntOrNull(): Int? {
val primitive = this as? JsonPrimitive ?: return null val primitive = this as? JsonPrimitive ?: return null
if (primitive.isString) return primitive.content.toIntOrNull() return primitive.content.toIntOrNull()
return primitive.intOrNull
} }
private fun JsonElement?.asLongOrNull(): Long? { private fun JsonElement?.asLongOrNull(): Long? {
val primitive = this as? JsonPrimitive ?: return null val primitive = this as? JsonPrimitive ?: return null
if (primitive.isString) return primitive.content.toLongOrNull() return primitive.content.toLongOrNull()
return primitive.longOrNull
} }
private fun JsonElement?.asBooleanOrNull(): Boolean? { private fun JsonElement?.asBooleanOrNull(): Boolean? {
val primitive = this as? JsonPrimitive ?: return null val primitive = this as? JsonPrimitive ?: return null
if (primitive.booleanOrNull != null) return primitive.booleanOrNull val content = primitive.content.trim().lowercase()
val content = primitive.contentOrNull?.trim()?.lowercase() ?: return null
return when (content) { return when (content) {
"true", "yes", "1" -> true "true", "yes", "1" -> true
"false", "no", "0" -> false "false", "no", "0" -> false

6
apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
View File

@@ -699,12 +699,12 @@ class TalkModeManager(
private fun JsonElement?.asObjectOrNull(): JsonObject? = this as? JsonObject private fun JsonElement?.asObjectOrNull(): JsonObject? = this as? JsonObject
private fun JsonElement?.asStringOrNull(): String? = (this as? JsonPrimitive)?.contentOrNull private fun JsonElement?.asStringOrNull(): String? =
(this as? JsonPrimitive)?.takeIf { it.isString }?.content
private fun JsonElement?.asBooleanOrNull(): Boolean? { private fun JsonElement?.asBooleanOrNull(): Boolean? {
val primitive = this as? JsonPrimitive ?: return null val primitive = this as? JsonPrimitive ?: return null
if (primitive.booleanOrNull != null) return primitive.booleanOrNull val content = primitive.content.trim().lowercase()
val content = primitive.contentOrNull?.trim()?.lowercase() ?: return null
return when (content) { return when (content) {
"true", "yes", "1" -> true "true", "yes", "1" -> true
"false", "no", "0" -> false "false", "no", "0" -> false