Fix Human Expert task delivery and restore native chat state synchronization

Author: ScreenOperator AI

app/src/main/kotlin/com/google/ai/sample/feature/multimodal/PhotoReasoningViewModel.kt

@@ -1708,24 +1708,21 @@ class PhotoReasoningViewModel(
         if (signalingClient != null) {
             return
         }
-        startHumanExpertSessionInternal(taskText, fromJs = true)
+        startHumanExpertSessionInternal(taskText)
     }
 
     private fun startHumanExpertSession(taskText: String) {
-        startHumanExpertSessionInternal(taskText, fromJs = false)
+        startHumanExpertSessionInternal(taskText)
     }
 
-    private fun startHumanExpertSessionInternal(taskText: String, fromJs: Boolean) {
+    private fun startHumanExpertSessionInternal(taskText: String) {
         if (signalingClient != null) {
-            if (!fromJs) postTaskToHumanExpert(taskText)
             return
         }
 
-        if (!fromJs) {
-            _uiState.value = PhotoReasoningUiState.Loading
-            _chatState.addMessage(PhotoReasoningMessage(text = "Connecting to Human Expert network...", participant = PhotoParticipant.MODEL, isPending = true))
-            _chatMessagesFlow.value = _chatState.getAllMessages()
-        }
+        _uiState.value = PhotoReasoningUiState.Loading
+        _chatState.addMessage(PhotoReasoningMessage(text = "Connecting to Human Expert network...", participant = PhotoParticipant.MODEL, isPending = true))
+        _chatMessagesFlow.value = _chatState.getAllMessages()
 
         // Initialize WebRTC Sender
         webRTCSender = WebRTCSender(getApplication(), object : WebRTCSender.WebRTCSenderListener {
@@ -1739,7 +1736,7 @@ class PhotoReasoningViewModel(
                     if (state == "CONNECTED") {
                         val connectedMsg = com.google.ai.sample.util.UiStringsConfig.get("msg_expert_connected", "The connection has been successfully established. The expert is completing the task.")
                         _commandExecutionStatus.value = connectedMsg
-                        if (!fromJs) replaceAiMessageText(connectedMsg, isPending = false)
+                        replaceAiMessageText(connectedMsg, isPending = false)
                         MainActivity.getInstance()?.notifyHumanExpertStatusToWebView(connectedMsg, true, false, connectedMsg)
                     } else if (state == "DISCONNECTED" || state == "FAILED") {
                          _commandExecutionStatus.value = "Expert disconnected."
@@ -1755,15 +1752,13 @@ class PhotoReasoningViewModel(
             // Handle incoming text from human operator
             override fun onTextReceived(text: String) {
                 viewModelScope.launch(Dispatchers.Main) {
-                    if (!fromJs) {
-                        val newMessage = PhotoReasoningMessage(
-                            text = "Operator: $text",
-                            participant = PhotoParticipant.MODEL,
-                            isPending = false
-                        )
-                        _chatState.addMessage(newMessage)
-                        _chatMessagesFlow.value = _chatState.getAllMessages()
-                    }
+                    val newMessage = PhotoReasoningMessage(
+                        text = "Operator: $text",
+                        participant = PhotoParticipant.MODEL,
+                        isPending = false
+                    )
+                    _chatState.addMessage(newMessage)
+                    _chatMessagesFlow.value = _chatState.getAllMessages()
                     MainActivity.getInstance()?.notifyHumanExpertMessageToWebView(text)
                 }
             }
@@ -1782,7 +1777,7 @@ class PhotoReasoningViewModel(
             override fun onTaskPosted(taskId: String) {
                 viewModelScope.launch(Dispatchers.Main) {
                     val msg = "Task posted. Waiting for an expert to claim it..."
-                    if (!fromJs) replaceAiMessageText(msg, isPending = true)
+                    replaceAiMessageText(msg, isPending = true)
                     MainActivity.getInstance()?.notifyHumanExpertStatusToWebView(msg, false, true, msg)
                 }
             }
@@ -1791,7 +1786,7 @@ class PhotoReasoningViewModel(
                 Log.d(TAG, "Task claimed! Requesting fresh MediaProjection for WebRTC.")
                 viewModelScope.launch(Dispatchers.Main) {
                     val foundMsg = com.google.ai.sample.util.UiStringsConfig.get("msg_expert_found", "Expert found! Requesting screen capture permission...")
-                    if (!fromJs) replaceAiMessageText(foundMsg, isPending = true)
+                    replaceAiMessageText(foundMsg, isPending = true)
                     MainActivity.getInstance()?.notifyHumanExpertStatusToWebView(foundMsg, false, true, foundMsg)
 
                     // Request a fresh MediaProjection specifically for WebRTC.
@@ -1802,7 +1797,7 @@ class PhotoReasoningViewModel(
                         mainActivity.requestMediaProjectionForWebRTC { _, resultData ->
                             Log.d(TAG, "WebRTC MediaProjection granted. Service läuft bereits via KEEP_ALIVE. Starte Screen Capture.")
                             val estMsg = com.google.ai.sample.util.UiStringsConfig.get("msg_establishing_video", "Establishing video connection...")
-                            if (!fromJs) replaceAiMessageText(estMsg, isPending = true)
+                            replaceAiMessageText(estMsg, isPending = true)
                             MainActivity.getInstance()?.notifyHumanExpertStatusToWebView(estMsg, false, true, estMsg)
 
                             // KEIN startForegroundService() hier - MainActivity hat bereits ACTION_KEEP_ALIVE_FOR_WEBRTC gesendet.
@@ -1852,7 +1847,7 @@ class PhotoReasoningViewModel(
                  viewModelScope.launch(Dispatchers.Main) {
                     val msg = com.google.ai.sample.util.UiStringsConfig.get("msg_expert_disconnected", "Expert disconnected.")
                     _commandExecutionStatus.value = msg
-                    if (!fromJs) replaceAiMessageText(msg, isPending = false)
+                    replaceAiMessageText(msg, isPending = false)
                     MainActivity.getInstance()?.notifyHumanExpertStatusToWebView(msg, false, false, msg)
                     webRTCSender?.stop()
                     webRTCSender = null

index.html

@@ -5302,7 +5302,7 @@
     _humanExpertConnected = false;
     addModelBubble(DEFAULT_UI_STRINGS.msg_expert_found, true);
     if (getInAndroid()) {
-      Bridge.startHumanExpertSession(text);
+      Bridge.sendMessage(text);
     }
     window.onGenerationStateChanged(true, false);
     return;