From 262205b615bc9cf973930b59199a3595dd937984 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 2 Jun 2025 14:59:32 +0200 Subject: [PATCH 1/2] Include mentions in the attachments Signed-off-by: sowjanyakch --- .../com/nextcloud/talk/adapters/items/ConversationItem.kt | 4 ++-- .../java/com/nextcloud/talk/models/json/chat/ChatUtils.kt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) 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 8b2433438..c51a07398 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 @@ -431,9 +431,9 @@ class ConversationItem( ) return lastMessage } else if (MessageType.SINGLE_NC_ATTACHMENT_MESSAGE == chatMessage?.getCalculateMessageType()) { - var attachmentName = chatMessage.message + var attachmentName = chatMessage.text if (attachmentName == "{file}") { - attachmentName = chatMessage.messageParameters?.get("file")?.get("name") + attachmentName = chatMessage.messageParameters?.get("file")?.get("name")!! } val author = authorName(chatMessage) diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt index 818680c3f..78a830cc4 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt @@ -29,7 +29,8 @@ class ChatUtils { if (individualHashMap != null) { val type = individualHashMap["type"] - resultMessage = if (type == "user" || type == "guest" || type == "call" || type == "email") { + resultMessage = if (type == "user" || type == "guest" || type == "call" || type == "email" || + type == "user-group" || type == "circle") { resultMessage?.replace("{$key}", "@" + individualHashMap["name"]) } else if (type == "geo-location") { individualHashMap["name"] From 632a26d3cb2c2c69d50fac87c07a6e4bd1b42f76 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 2 Jun 2025 15:10:51 +0200 Subject: [PATCH 2/2] format Signed-off-by: sowjanyakch --- .../com/nextcloud/talk/adapters/items/ConversationItem.kt | 2 +- .../java/com/nextcloud/talk/models/json/chat/ChatUtils.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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 c51a07398..89cd98fc4 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 @@ -433,7 +433,7 @@ class ConversationItem( } else if (MessageType.SINGLE_NC_ATTACHMENT_MESSAGE == chatMessage?.getCalculateMessageType()) { var attachmentName = chatMessage.text if (attachmentName == "{file}") { - attachmentName = chatMessage.messageParameters?.get("file")?.get("name")!! + attachmentName = chatMessage.messageParameters?.get("file")?.get("name") ?: "" } val author = authorName(chatMessage) diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt index 78a830cc4..90048be05 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt @@ -21,7 +21,7 @@ class ChatUtils { return message } - @Suppress("Detekt.ComplexMethod") + @Suppress("Detekt.ComplexMethod", "Detekt.ComplexCondition") private fun parse(messageParameters: HashMap>, message: String?): String? { var resultMessage = message for (key in messageParameters.keys) { @@ -30,7 +30,8 @@ class ChatUtils { if (individualHashMap != null) { val type = individualHashMap["type"] resultMessage = if (type == "user" || type == "guest" || type == "call" || type == "email" || - type == "user-group" || type == "circle") { + type == "user-group" || type == "circle" + ) { resultMessage?.replace("{$key}", "@" + individualHashMap["name"]) } else if (type == "geo-location") { individualHashMap["name"]