Skip to content

Commit 2c6fc99

Browse files
UI Fix: Filter screenshots from chat bubbles for text-only models (GLM-5, etc.) while keeping them for models with image support (Gemma, etc.)
1 parent 12fcfde commit 2c6fc99

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ class PhotoReasoningViewModel(
540540
val userMessage = PhotoReasoningMessage(
541541
text = aiPromptText, // Use the combined text
542542
participant = PhotoParticipant.USER,
543-
imageUris = imageUrisForChat ?: emptyList(), // Use the new parameter here
543+
imageUris = if (com.google.ai.sample.GenerativeAiViewModelFactory.getCurrentModel().supportsScreenshot) (imageUrisForChat ?: emptyList()) else emptyList(),
544544
isPending = false
545545
)
546546
Log.d(TAG, "performReasoning: Adding user message to _chatState. Text: \"${userMessage.text.take(100)}...\", Images: ${userMessage.imageUris.size}")
@@ -626,7 +626,7 @@ class PhotoReasoningViewModel(
626626
val userMessage = PhotoReasoningMessage(
627627
text = userInput,
628628
participant = PhotoParticipant.USER,
629-
imageUris = imageUrisForChat ?: emptyList(),
629+
imageUris = if (currentModel.supportsScreenshot) (imageUrisForChat ?: emptyList()) else emptyList(),
630630
isPending = false
631631
)
632632
_chatState.addMessage(userMessage)
@@ -695,7 +695,7 @@ class PhotoReasoningViewModel(
695695
val userMessage = PhotoReasoningMessage(
696696
text = userMessageText,
697697
participant = PhotoParticipant.USER,
698-
imageUris = imageUrisForChat ?: emptyList(),
698+
imageUris = if (currentModel.supportsScreenshot) (imageUrisForChat ?: emptyList()) else emptyList(),
699699
isPending = false
700700
)
701701
_chatState.addMessage(userMessage)
@@ -817,7 +817,7 @@ class PhotoReasoningViewModel(
817817
val userMessage = PhotoReasoningMessage(
818818
text = combinedPromptText,
819819
participant = PhotoParticipant.USER,
820-
imageUris = imageUrisForChat ?: emptyList(),
820+
imageUris = if (currentModel.supportsScreenshot) (imageUrisForChat ?: emptyList()) else emptyList(),
821821
isPending = false
822822
)
823823
_chatState.addMessage(userMessage)
@@ -1021,7 +1021,7 @@ class PhotoReasoningViewModel(
10211021
val userMessage = PhotoReasoningMessage(
10221022
text = combinedPromptText,
10231023
participant = PhotoParticipant.USER,
1024-
imageUris = imageUrisForChat ?: emptyList(),
1024+
imageUris = if (com.google.ai.sample.GenerativeAiViewModelFactory.getCurrentModel().supportsScreenshot) (imageUrisForChat ?: emptyList()) else emptyList(),
10251025
isPending = false
10261026
)
10271027
_chatState.addMessage(userMessage)
@@ -1182,7 +1182,7 @@ class PhotoReasoningViewModel(
11821182
val userMessage = PhotoReasoningMessage(
11831183
text = userMessageText,
11841184
participant = PhotoParticipant.USER,
1185-
imageUris = imageUrisForChat ?: emptyList(),
1185+
imageUris = if (currentModel.supportsScreenshot) (imageUrisForChat ?: emptyList()) else emptyList(),
11861186
isPending = false
11871187
)
11881188
_chatState.addMessage(userMessage)

0 commit comments

Comments
 (0)