mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-09 22:04:24 +01:00
Merge pull request #4081 from nextcloud/issue-4074-conversation-list-bug
Last message in Conversation is formatted correctly
This commit is contained in:
commit
2f251d05d2
@ -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)) {
|
||||
|
Loading…
Reference in New Issue
Block a user