From 727ae469cf33358b9e80fdf3dcfc7e9c6380b2ab Mon Sep 17 00:00:00 2001
From: Ayaan Zaidi <zaidi@uplause.io>
Date: Sat, 28 Feb 2026 19:33:44 +0530
Subject: [PATCH] perf(android): reduce mic conversation update churn

---
 .../android/voice/MicCaptureManager.kt        | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/apps/android/app/src/main/java/ai/openclaw/android/voice/MicCaptureManager.kt b/apps/android/app/src/main/java/ai/openclaw/android/voice/MicCaptureManager.kt
index 70f228a733a..5d7336cdf6f 100644
--- a/apps/android/app/src/main/java/ai/openclaw/android/voice/MicCaptureManager.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/voice/MicCaptureManager.kt
@@ -51,10 +51,6 @@ class MicCaptureManager(
     private const val pendingRunTimeoutMs = 45_000L
   }
 
-  private data class QueuedUtterance(
-    val text: String,
-  )
-
   private val mainHandler = Handler(Looper.getMainLooper())
   private val json = Json { ignoreUnknownKeys = true }
 
@@ -82,7 +78,7 @@ class MicCaptureManager(
   private val _isSending = MutableStateFlow(false)
   val isSending: StateFlow<Boolean> = _isSending
 
-  private val messageQueue = ArrayDeque<QueuedUtterance>()
+  private val messageQueue = ArrayDeque<String>()
   private val sessionSegments = mutableListOf<String>()
   private var lastFinalSegment: String? = null
   private var pendingRunId: String? = null
@@ -255,12 +251,12 @@ class MicCaptureManager(
       role = VoiceConversationRole.User,
       text = message,
     )
-    messageQueue.addLast(QueuedUtterance(text = message))
+    messageQueue.addLast(message)
     publishQueue()
   }
 
   private fun publishQueue() {
-    _queuedMessages.value = messageQueue.map { it.text }
+    _queuedMessages.value = messageQueue.toList()
   }
 
   private fun sendQueuedIfIdle() {
@@ -286,7 +282,7 @@ class MicCaptureManager(
 
     scope.launch {
       try {
-        val runId = sendToGateway(next.text)
+        val runId = sendToGateway(next)
         pendingRunId = runId
         if (runId == null) {
           pendingRunTimeoutJob?.cancel()
@@ -365,15 +361,21 @@ class MicCaptureManager(
 
   private fun updateConversationEntry(id: String, text: String?, isStreaming: Boolean) {
     val current = _conversation.value
-    _conversation.value =
-      current.map { entry ->
-        if (entry.id == id) {
-          val updatedText = text ?: entry.text
-          entry.copy(text = updatedText, isStreaming = isStreaming)
-        } else {
-          entry
-        }
+    if (current.isEmpty()) return
+
+    val targetIndex =
+      when {
+        current[current.lastIndex].id == id -> current.lastIndex
+        else -> current.indexOfFirst { it.id == id }
       }
+    if (targetIndex < 0) return
+
+    val entry = current[targetIndex]
+    val updatedText = text ?: entry.text
+    if (updatedText == entry.text && entry.isStreaming == isStreaming) return
+    val updated = current.toMutableList()
+    updated[targetIndex] = entry.copy(text = updatedText, isStreaming = isStreaming)
+    _conversation.value = updated
   }
 
   private fun upsertPendingAssistant(text: String, isStreaming: Boolean) {