Revert "use label"

This reverts commit d9cbe3e.
nextcloud · Feb 7, 2025 · a003abe · a003abe
1 parent d9cbe3e
commit a003abe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
@@ -838,17 +838,15 @@ class MessageInputFragment : Fragment() {
             for (i in mentionSpans.indices) {
                 mentionSpan = mentionSpans[i]
                 var mentionId = mentionSpan.id
-                var label = mentionSpan.label
                 val shouldQuote = mentionId.contains(" ") ||
                     mentionId.contains("@") ||
                     mentionId.startsWith("guest/") ||
                     mentionId.startsWith("group/") ||
                     mentionId.startsWith("email/")
                 if (shouldQuote) {
                     mentionId = "\"" + mentionId + "\""
-                    label = "\"" + label + "\""
                 }
-                editable.replace(editable.getSpanStart(mentionSpan), editable.getSpanEnd(mentionSpan), "@$label")
+                editable.replace(editable.getSpanStart(mentionSpan), editable.getSpanEnd(mentionSpan), "@$mentionId")
             }
 
             binding.fragmentMessageInputView.inputEditText?.setText("")

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
@@ -29,8 +29,7 @@ class ChatUtils {
 
                 if (individualHashMap != null) {
                     val type = individualHashMap["type"]
-                    resultMessage = if (type == "user" || type == "guest" || type == "call" || type == "email" ||
-                        type == "circle" || type == "teams") {
+                    resultMessage = if (type == "user" || type == "guest" || type == "call" || type == "email") {
                         resultMessage?.replace("{$key}", "@" + individualHashMap["name"])
                     } else if (type == "geo-location") {
                         individualHashMap["name"]