gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5025 from nextcloud/backport/5020/stable-21.1

Browse Source 
[stable-21.1] Include mentions in the attachments
This commit is contained in:
Marcel Hibbe 2025-06-03 14:56:30 +00:00 committed by GitHub
commit 2af047144b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 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

@ -431,9 +431,9 @@ class ConversationItem(
) )
return lastMessage return lastMessage
} else if (MessageType.SINGLE_NC_ATTACHMENT_MESSAGE == chatMessage?.getCalculateMessageType()) { } else if (MessageType.SINGLE_NC_ATTACHMENT_MESSAGE == chatMessage?.getCalculateMessageType()) {
var attachmentName = chatMessage.message var attachmentName = chatMessage.text
if (attachmentName == "{file}") { if (attachmentName == "{file}") {
attachmentName = chatMessage.messageParameters?.get("file")?.get("name") attachmentName = chatMessage.messageParameters?.get("file")?.get("name") ?: ""
} }
val author = authorName(chatMessage) val author = authorName(chatMessage)

6
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt
View File

@ -21,7 +21,7 @@ class ChatUtils {
return message return message
} }
@Suppress("Detekt.ComplexMethod") @Suppress("Detekt.ComplexMethod", "Detekt.ComplexCondition")
private fun parse(messageParameters: HashMap<String?, HashMap<String?, String?>>, message: String?): String? { private fun parse(messageParameters: HashMap<String?, HashMap<String?, String?>>, message: String?): String? {
var resultMessage = message var resultMessage = message
for (key in messageParameters.keys) { for (key in messageParameters.keys) {
@ -29,7 +29,9 @@ class ChatUtils {
if (individualHashMap != null) { if (individualHashMap != null) {
val type = individualHashMap["type"] 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"]) resultMessage?.replace("{$key}", "@" + individualHashMap["name"])
} else if (type == "geo-location") { } else if (type == "geo-location") {
individualHashMap["name"] individualHashMap["name"]