From a804932e7d390785f8ad17197a9686d180ca0ae4 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Fri, 31 Jan 2025 23:40:23 +0100 Subject: [PATCH] add team support for mentions Signed-off-by: sowjanyakch --- .../talk/adapters/items/MentionAutocompleteItem.kt | 7 +++++++ .../java/com/nextcloud/talk/chat/MessageInputFragment.kt | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt index 8bf3bf0fa..dcdbd0438 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt @@ -165,6 +165,12 @@ class MentionAutocompleteItem( } } + SOURCE_TEAMS ->{ + holder.binding.avatarView.loadUserAvatar( + viewThemeUtils.talk.themePlaceholderAvatar(holder.binding.avatarView, R.drawable.ic_avatar_group) + ) + } + else -> { holder.binding.avatarView.loadUserAvatar( currentUser, @@ -237,6 +243,7 @@ class MentionAutocompleteItem( const val SOURCE_GUESTS = "guests" const val SOURCE_GROUPS = "groups" const val SOURCE_EMAILS = "emails" + const val SOURCE_TEAMS = "teams" const val SOURCE_FEDERATION = "federated_users" } } diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt index 14607a210..76d7eaf07 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt @@ -838,7 +838,8 @@ class MessageInputFragment : Fragment() { mentionId.contains("@") || mentionId.startsWith("guest/") || mentionId.startsWith("group/") || - mentionId.startsWith("email/") + mentionId.startsWith("email/") || + mentionId.startsWith("team/") if (shouldQuote) { mentionId = "\"" + mentionId + "\"" }