fix(android): keep one-shot PTT retries idempotent

steipete · steipete · commit 2dbd12f4fd2e · 2026-07-06T06:33:54.000+01:00
diff --git a/apps/.i18n/native-source.json b/apps/.i18n/native-source.json
@@ -203,23 +203,23 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 2440,
+      "line": 2444,
       "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": 2442,
+      "line": 2446,
       "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": 2444,
+      "line": 2448,
       "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",
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
@@ -1759,6 +1759,10 @@ class NodeRuntime private constructor(
 
   private suspend fun handleTalkPttOnce(): GatewaySession.InvokeResult =
     runTalkPttCommand {
+      talkMode.activePushToTalkCaptureId?.let { captureId ->
+        val payload = TalkPttStopPayload(captureId = captureId, transcript = null, status = "busy")
+        return@runTalkPttCommand GatewaySession.InvokeResult.ok(payload.toJson())
+      }
       val lifecycleEpoch = voiceLifecycleEpoch.get()
       val commandEpoch = talkPttCommandEpoch.get()
       val start =
diff --git a/apps/android/app/src/test/java/ai/openclaw/app/GatewayBootstrapAuthTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/GatewayBootstrapAuthTest.kt
@@ -993,26 +993,25 @@ class GatewayBootstrapAuthTest {
   }
 
   @Test
-  @OptIn(ExperimentalCoroutinesApi::class)
-  fun talkPttOnceRetryPreservesCaptureCleanupOwnership() =
+  fun talkPttOnceRetryReturnsBusyWithoutPreparingCapture() =
     runBlocking {
       val app = RuntimeEnvironment.getApplication()
       shadowOf(app).grantPermissions(Manifest.permission.RECORD_AUDIO)
       val runtime = createTestRuntime(app)
       val talkMode = readField<Lazy<TalkModeManager>>(runtime, "talkMode\$delegate").value
       writeField(talkMode, "activePttCaptureId", "capture-1")
       val dispatcher = readField<InvokeDispatcher>(runtime, "invokeDispatcher")
-      Dispatchers.setMain(Dispatchers.Unconfined)
+      val preparationMutex = readField<Mutex>(runtime, "voiceCapturePreparationMutex")
+      preparationMutex.lock()
       try {
-        val retry = dispatcher.handleInvoke(OpenClawTalkCommand.PttOnce.rawValue, null)
+        val retry =
+          withTimeout(1_000) { dispatcher.handleInvoke(OpenClawTalkCommand.PttOnce.rawValue, null) }
         assertNull(retry.error)
-        assertTrue(readField<MutableStateFlow<Boolean>>(runtime, "externalAudioCaptureActive").value)
-
-        val cancel = dispatcher.handleInvoke(OpenClawTalkCommand.PttCancel.rawValue, null)
-        assertNull(cancel.error)
+        assertEquals("""{"captureId":"capture-1","status":"busy"}""", retry.payloadJson)
+        assertEquals("capture-1", talkMode.activePushToTalkCaptureId)
         assertFalse(readField<MutableStateFlow<Boolean>>(runtime, "externalAudioCaptureActive").value)
       } finally {
-        Dispatchers.resetMain()
+        preparationMutex.unlock()
       }
     }
 
