From de420a3a307710a54ac7f0501f317f478ae1bec3 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Thu, 10 Oct 2024 18:43:59 +0200 Subject: [PATCH] include deck card name as the lastMessageDisplayText Signed-off-by: sowjanyakch --- .../talk/adapters/items/ConversationItem.kt | 14 ++++++++++++++ app/src/main/res/values/strings.xml | 2 ++ 2 files changed, 16 insertions(+) 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 index d13be422c..e505ead99 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt @@ -410,6 +410,20 @@ class ConversationItem( chatMessage?.getNullsafeActorDisplayName() ) } + } else if (MessageType.DECK_CARD == chatMessage?.getCalculateMessageType()) { + return if (chatMessage?.actorId == chatMessage?.activeUser!!.userId) { + String.format( + sharedApplication!!.getString(R.string.nc_sent_deck_card_you), + chatMessage?.messageParameters?.get("object")?.get("name") + ) + } else { + String.format( + sharedApplication!!.resources.getString(R.string.nc_sent_deck_card), + chatMessage?.getNullsafeActorDisplayName(), + chatMessage?.messageParameters?.get("object")?.get("name") + + ) + } } } return "" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fb5464bcf..8c4864cfa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -407,6 +407,7 @@ How to translate with transifex: %1$s sent a poll. %1$s sent a location. %1$s sent a voice message. + %1$s: %2$s You sent a GIF. You sent an attachment. You sent an audio. @@ -415,6 +416,7 @@ How to translate with transifex: You sent a poll. You sent a location. You sent a voice message. + You: %1$s %1$s: %2$s Cancel reply