Skip to content

Commit

Permalink
[PBE-6029] bug in updating quoted message content
Browse files Browse the repository at this point in the history
  • Loading branch information
kanat authored and JcMinarro committed Oct 4, 2024
1 parent 0dfe205 commit ffdb9bd
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.TextStyle
import io.getstream.chat.android.client.utils.attachment.isGiphy
import io.getstream.chat.android.client.utils.attachment.isImage
import io.getstream.chat.android.client.utils.message.isDeleted
import io.getstream.chat.android.compose.R
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import io.getstream.chat.android.compose.ui.theme.MessageTheme
Expand Down Expand Up @@ -208,6 +209,7 @@ private class DefaultQuotedMessageTextFormatter(

val attachment = message.attachments.firstOrNull()
val quotedMessageText = when {
message.isDeleted() -> context.getString(R.string.stream_ui_message_list_message_deleted)
displayedText.isNotBlank() -> displayedText
attachment != null -> when {
attachment.name != null -> attachment.name
Expand All @@ -227,7 +229,7 @@ private class DefaultQuotedMessageTextFormatter(

val textColor = textStyle(replyMessage?.isMine(currentUser) != false).color
return buildAnnotatedMessageText(
text = displayedText,
text = quotedMessageText,
textColor = textColor,
textFontStyle = typography.body.fontStyle,
linkColor = colors.primaryAccent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,7 @@
<string name="stream_ui_message_list_attachment_invalid_url">The load failed due to the invalid url.</string>
<string name="stream_ui_message_list_attachment_invalid_mime_type">Something went wrong. Unable to open attachment: %s</string>
<string name="stream_ui_message_list_attachment_display_error">Error. File can\'t be displayed</string>

<!-- Message List -->
<string name="stream_ui_message_list_message_deleted">This message was deleted.</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<string name="stream_ui_message_list_attachment_load_failed">"No se pudo cargar debido a un error inesperado."</string>
<string name="stream_ui_message_list_error_cannot_open_link">"No hay ninguna aplicación para ver esta URL:
%s"</string>
<string name="stream_ui_message_list_message_deleted">Este mensaje fue eliminado.</string>
<string name="stream_ui_message_list_video_display_error">"Error. el video no se puede mostrar"</string>
<string name="stream_ui_moderation_dialog_delete">"Eliminar mensaje"</string>
<string name="stream_ui_moderation_dialog_description">"Este mensaje puede infringir nuestra política de moderación. ¿Estás seguro de que quieres enviarlo? Eche un vistazo a nuestras Pautas de la comunidad."</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
<string name="stream_ui_message_list_attachment_invalid_mime_type">"Un problème est survenu. Impossible d\'ouvrir la pièce jointe: %s"</string>
<string name="stream_ui_message_list_attachment_invalid_url">"Le chargement a échoué en raison d\'une URL non valide."</string>
<string name="stream_ui_message_list_attachment_load_failed">"Le chargement a échoué en raison d\'une erreur inconnue."</string>
<string name="stream_ui_message_list_message_deleted">Ce message a été supprimé.</string>
<string name="stream_ui_yesterday">"Hier"</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
<string name="stream_ui_message_list_attachment_invalid_mime_type">"Terjadi kesalahan. Tidak dapat membuka lampiran: %s"</string>
<string name="stream_ui_message_list_attachment_invalid_url">"Data gagal dimuat karena url tidak valid."</string>
<string name="stream_ui_message_list_attachment_load_failed">"Data gagal dimuat karena kesalahan yang tidak diketahui."</string>
<string name="stream_ui_message_list_message_deleted">Pesan ini telah dihapus.</string>
<string name="stream_ui_yesterday">"Kemarin"</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
<string name="stream_ui_message_list_attachment_invalid_mime_type">"Qualcosa è andato storto. Impossibile aprire l\'allegato: %s"</string>
<string name="stream_ui_message_list_attachment_invalid_url">"Caricamento non riuscito a causa di un URL non valido."</string>
<string name="stream_ui_message_list_attachment_load_failed">"Caricamento non riuscito a causa di un errore sconosciuto."</string>
<string name="stream_ui_message_list_message_deleted">Questo messaggio è stato eliminato.</string>
<string name="stream_ui_yesterday">"Ieri"</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
<string name="stream_ui_message_list_attachment_invalid_mime_type">"문제가 발생했습니다. 첨부 파일을 열 수 없음: %s"</string>
<string name="stream_ui_message_list_attachment_invalid_url">"잘못된 URL로 인해 로드에 실패했습니다."</string>
<string name="stream_ui_message_list_attachment_load_failed">"알 수 없는 오류로 인해 로드에 실패했습니다."</string>
<string name="stream_ui_message_list_message_deleted">이 메시지가 삭제되었습니다.</string>
<string name="stream_ui_yesterday">"어제"</string>
</resources>
3 changes: 3 additions & 0 deletions stream-chat-android-ui-common/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
<string name="stream_ui_message_list_error_cannot_open_link">There is no app to view this url:\n%s</string>
<string name="stream_ui_message_list_footnote_edited_now">just now</string>

<!-- Message List -->
<string name="stream_ui_message_list_message_deleted">This message was deleted.</string>

<!--Moderation Dialog-->
<string name="stream_ui_moderation_dialog_title">Failed to send message</string>
<string name="stream_ui_moderation_dialog_description">This message might violate our moderation policy. Are you sure you want to send it? Please take a look at our Community Guidelines.</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import io.getstream.chat.android.client.ChatClient
import io.getstream.chat.android.client.extensions.duration
import io.getstream.chat.android.client.utils.attachment.isAudioRecording
import io.getstream.chat.android.client.utils.attachment.isLink
import io.getstream.chat.android.client.utils.message.isDeleted
import io.getstream.chat.android.models.Message
import io.getstream.chat.android.ui.ChatUI
import io.getstream.chat.android.ui.R
Expand Down Expand Up @@ -213,7 +214,9 @@ public class MessageReplyView : FrameLayout {
private fun setReplyText(message: Message, isMine: Boolean, style: MessageReplyStyle?) {
val attachment = message.attachments.lastOrNull()
val displayedText = message.getTranslatedText()
binding.replyText.text = if (attachment == null || displayedText.isNotBlank()) {
binding.replyText.text = if (message.isDeleted()) {
context.getString(R.string.stream_ui_message_list_message_deleted)
} else if (attachment == null || displayedText.isNotBlank()) {
if (ellipsize) {
ellipsize(displayedText)
} else {
Expand Down

0 comments on commit ffdb9bd

Please sign in to comment.