gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-09 22:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Last message in Conversation is formatted correctly
This commit is contained in:
Sowjanya Kota 2024-08-15 16:09:54 +02:00 committed by GitHub
commit 2f251d05d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,7 +232,7 @@ class ConversationItem(
val text = val text =
if ( if (
chatMessage?.messageType === MessageType.REGULAR_TEXT_MESSAGE.toString() chatMessage?.getCalculateMessageType() == MessageType.REGULAR_TEXT_MESSAGE
) { ) {
calculateRegularLastMessageText(appContext) calculateRegularLastMessageText(appContext)
} else { } else {
@ -252,6 +252,8 @@ class ConversationItem(
appContext.getString(R.string.nc_formatted_message_you), appContext.getString(R.string.nc_formatted_message_you),
lastMessageDisplayText lastMessageDisplayText
) )
} else if (model.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
lastMessageDisplayText
} else { } else {
val authorDisplayName = val authorDisplayName =
if (!TextUtils.isEmpty(chatMessage?.actorDisplayName)) { if (!TextUtils.isEmpty(chatMessage?.actorDisplayName)) {