From fe8f19be1b43f4ae74bbdbb9d31ab4404c5cbfbf Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Thu, 27 Feb 2025 22:10:30 +0100
Subject: [PATCH] add endpoints

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
 app/src/main/java/com/nextcloud/talk/api/NcApi.java    | 10 ++++++++++
 app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt |  8 ++++++++
 .../com/nextcloud/talk/utils/message/MessageUtils.kt   |  1 +
 3 files changed, 19 insertions(+)

diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApi.java b/app/src/main/java/com/nextcloud/talk/api/NcApi.java
index ca5d7afe5..3a7f423d5 100644
--- a/app/src/main/java/com/nextcloud/talk/api/NcApi.java
+++ b/app/src/main/java/com/nextcloud/talk/api/NcApi.java
@@ -34,6 +34,8 @@ import com.nextcloud.talk.models.json.signaling.SignalingOverall;
 import com.nextcloud.talk.models.json.signaling.settings.SignalingSettingsOverall;
 import com.nextcloud.talk.models.json.status.StatusOverall;
 import com.nextcloud.talk.models.json.unifiedsearch.UnifiedSearchOverall;
+import com.nextcloud.talk.models.json.usercircles.UserCirclesOverall;
+import com.nextcloud.talk.models.json.usergroups.UserGroupsOverall;
 import com.nextcloud.talk.models.json.userprofile.UserProfileFieldsOverall;
 import com.nextcloud.talk.models.json.userprofile.UserProfileOverall;
 import com.nextcloud.talk.polls.repositories.model.PollOverall;
@@ -646,4 +648,12 @@ public interface NcApi {
     @DELETE
     Observable<GenericOverall> rejectInvitation(@Header("Authorization") String authorization,
                                                 @Url String url);
+
+    @GET
+    Observable<UserGroupsOverall> getUserGroups (@Header("Authorization") String authorization,
+                                                 @Url String url);
+
+    @GET
+    Observable<UserCirclesOverall> getUserCircles(@Header("Authorization") String authorization,
+                                                  @Url String url);
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt
index fe258be3c..e8e34c4f3 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt
@@ -363,6 +363,14 @@ object ApiUtils {
         return "$baseUrl$OCS_API_VERSION/cloud/users/$userId"
     }
 
+    fun getUrlForUserGroups(baseUrl: String, userId: String): String {
+        return "$baseUrl$OCS_API_VERSION/cloud/users/$userId/groups"
+    }
+
+    fun getUrlForUserCircles(baseUrl: String): String {
+        return "$baseUrl$OCS_API_VERSION/apps/circles/probecircles"
+    }
+
     fun getUrlForUserSettings(baseUrl: String): String {
         // FIXME Introduce API version
         return "$baseUrl$OCS_API_VERSION$SPREED_API_VERSION/settings/user"
diff --git a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
index 985a0aa1e..81944ac42 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
@@ -110,6 +110,7 @@ class MessageUtils(val context: Context) {
         for (key in messageParameters.keys) {
             val individualHashMap = message.messageParameters?.get(key)
             if (individualHashMap != null) {
+
                 when (individualHashMap["type"]) {
                     "user", "guest", "call", "user-group", "email", "circle" -> {
                         val chip = if (individualHashMap["id"]?.equals(message.activeUser?.userId) == true) {