Merge pull request #4081 from nextcloud/issue-4074-conversation-list-bug

Last message in Conversation is formatted correctly
nextcloud · Aug 15, 2024 · 2f251d0 · 2f251d0
2 parents 176ec82 + 903dd07
commit 2f251d0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
@@ -232,7 +232,7 @@ class ConversationItem(
 
                 val text =
                     if (
-                        chatMessage?.messageType === MessageType.REGULAR_TEXT_MESSAGE.toString()
+                        chatMessage?.getCalculateMessageType() == MessageType.REGULAR_TEXT_MESSAGE
                     ) {
                         calculateRegularLastMessageText(appContext)
                     } else {
@@ -252,6 +252,8 @@ class ConversationItem(
                 appContext.getString(R.string.nc_formatted_message_you),
                 lastMessageDisplayText
             )
+        } else if (model.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
+            lastMessageDisplayText
         } else {
             val authorDisplayName =
                 if (!TextUtils.isEmpty(chatMessage?.actorDisplayName)) {