refactor(android): make Talk capture policy explicit

steipete · steipete · commit ae446c11c8e5 · 2026-07-02T14:01:54.000+01:00
diff --git a/apps/.i18n/native-source.json b/apps/.i18n/native-source.json
@@ -75,23 +75,23 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1686,
+      "line": 1695,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt",
       "source": "Failed: this host requires wss:// or Tailscale Serve. No TLS endpoint detected.",
       "surface": "android",
       "id": "native.android.81009c40eed2216d"
     },
     {
       "kind": "conditional-branch",
-      "line": 1688,
+      "line": 1697,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt",
       "source": "Failed: secure endpoint reached, but TLS fingerprint verification timed out. Check Tailscale Serve or gateway TLS and retry.",
       "surface": "android",
       "id": "native.android.467899bb510b8e34"
     },
     {
       "kind": "conditional-branch",
-      "line": 1690,
+      "line": 1699,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt",
       "source": "Failed: couldn't reach the secure gateway endpoint for this host.",
       "surface": "android",
@@ -4931,31 +4931,31 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 336,
+      "line": 342,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/voice/TalkModeManager.kt",
       "source": "Listening",
       "surface": "android",
       "id": "native.android.b4f67e96603515bd"
     },
     {
       "kind": "conditional-branch",
-      "line": 336,
+      "line": 342,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/voice/TalkModeManager.kt",
       "source": "Ready",
       "surface": "android",
       "id": "native.android.b88e4278ead724ba"
     },
     {
       "kind": "conditional-branch",
-      "line": 1623,
+      "line": 1629,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/voice/TalkModeManager.kt",
       "source": "Aborted",
       "surface": "android",
       "id": "native.android.13531fe081a45711"
     },
     {
       "kind": "conditional-branch",
-      "line": 1623,
+      "line": 1629,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/voice/TalkModeManager.kt",
       "source": "Chat error",
       "surface": "android",
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt b/apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt
@@ -1248,7 +1248,7 @@ class NodeRuntime(
         return@runTalkPttCommand GatewaySession.InvokeResult.ok(payload.toJson())
       }
       runPreparedTalkPttCommand {
-        val payload = talkMode.beginPushToTalk()
+        val payload = talkMode.beginPushToTalk(allowNewCapture = true)
         GatewaySession.InvokeResult.ok(payload.toJson())
       }
     }
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/voice/TalkModeManager.kt b/apps/android/app/src/main/java/ai/openclaw/app/voice/TalkModeManager.kt
@@ -243,19 +243,19 @@ class TalkModeManager internal constructor(
   }
 
   /** Starts a push-to-talk capture session for gateway node.invoke callers. */
-  suspend fun beginPushToTalk(allowNewCapture: Boolean = true): TalkPttStartPayload {
-    if (!allowNewCapture && activePttCaptureId == null) {
-      throw IllegalStateException("NODE_BACKGROUND_UNAVAILABLE: command requires foreground")
+  suspend fun beginPushToTalk(allowNewCapture: Boolean): TalkPttStartPayload {
+    if (!allowNewCapture) {
+      // A background retry may reconcile an existing capture, but must never create one.
+      return activePttCaptureId
+        ?.let(::TalkPttStartPayload)
+        ?: throw IllegalStateException("NODE_BACKGROUND_UNAVAILABLE: command requires foreground")
     }
     if (!isConnected()) {
       _statusText.value = "Gateway not connected"
       throw IllegalStateException("UNAVAILABLE: Gateway not connected")
     }
     // PTT begin is idempotent so gateway retries don't start multiple recognizers.
     activePttCaptureId?.let { return TalkPttStartPayload(captureId = it) }
-    if (!allowNewCapture) {
-      throw IllegalStateException("NODE_BACKGROUND_UNAVAILABLE: command requires foreground")
-    }
 
     stopSpeaking(resetInterrupt = false)
     pttTimeoutJob?.cancel()
@@ -359,7 +359,7 @@ class TalkModeManager internal constructor(
       )
     }
 
-    beginPushToTalk()
+    beginPushToTalk(allowNewCapture = true)
     val completion = CompletableDeferred<TalkPttStopPayload>()
     pttCompletion = completion
     pttAutoStopEnabled = true

Original file line number	Diff line number	Diff line change
`@@ -1248,7 +1248,7 @@ class NodeRuntime(`
`1248`	`1248`	`return@runTalkPttCommand GatewaySession.InvokeResult.ok(payload.toJson())`
`1249`	`1249`	`}`
`1250`	`1250`	`runPreparedTalkPttCommand {`
`1251`		`- val payload = talkMode.beginPushToTalk()`
	`1251`	`+ val payload = talkMode.beginPushToTalk(allowNewCapture = true)`
`1252`	`1252`	`GatewaySession.InvokeResult.ok(payload.toJson())`
`1253`	`1253`	`}`
`1254`	`1254`	`}`