Skip to content

Commit 2f251d0

Browse files
authored
Merge pull request #4081 from nextcloud/issue-4074-conversation-list-bug
Last message in Conversation is formatted correctly
2 parents 176ec82 + 903dd07 commit 2f251d0

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class ConversationItem(
232232

233233
val text =
234234
if (
235-
chatMessage?.messageType === MessageType.REGULAR_TEXT_MESSAGE.toString()
235+
chatMessage?.getCalculateMessageType() == MessageType.REGULAR_TEXT_MESSAGE
236236
) {
237237
calculateRegularLastMessageText(appContext)
238238
} else {
@@ -252,6 +252,8 @@ class ConversationItem(
252252
appContext.getString(R.string.nc_formatted_message_you),
253253
lastMessageDisplayText
254254
)
255+
} else if (model.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
256+
lastMessageDisplayText
255257
} else {
256258
val authorDisplayName =
257259
if (!TextUtils.isEmpty(chatMessage?.actorDisplayName)) {

0 commit comments

Comments
 (0)