first (not yet working) try

3 files changed, 10 insertions, 31 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
index 29b3706fa..b9f6f403d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
@@ -16,7 +16,6 @@ import it.niedermann.nextcloud.deck.model.full.FullStack;
 import it.niedermann.nextcloud.deck.model.ocs.Activity;
 import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 import it.niedermann.nextcloud.deck.model.ocs.comment.OcsComment;
-import it.niedermann.nextcloud.deck.model.ocs.user.OcsUser;
 import it.niedermann.nextcloud.deck.model.ocs.user.OcsUserList;
 
 /**
@@ -40,7 +39,6 @@ public class GsonConfig {
         Type stack = new TypeToken<FullStack>() {}.getType();
         Type capabilities = new TypeToken<Capabilities>() {}.getType();
         Type ocsUserList = new TypeToken<OcsUserList>() {}.getType();
-        Type ocsUser = new TypeToken<OcsUser>() {}.getType();
         Type activity = new TypeToken<Activity>() {}.getType();
         Type attachment = new TypeToken<Attachment>() {}.getType();
         Type attachmentList = new TypeToken<List<Attachment>>() {}.getType();
@@ -60,7 +58,6 @@ public class GsonConfig {
                 .registerTypeAdapter(stack,             new NextcloudDeserializer<>("stack", FullStack.class))
                 .registerTypeAdapter(capabilities,      new NextcloudDeserializer<>("capability", Capabilities.class))
                 .registerTypeAdapter(ocsUserList,       new NextcloudDeserializer<>("ocsUserList", OcsUserList.class))
-                .registerTypeAdapter(ocsUser,           new NextcloudDeserializer<>("ocsUser", OcsUser.class))
                 .registerTypeAdapter(activity,          new NextcloudDeserializer<>("activity", Activity.class))
                 .registerTypeAdapter(attachmentList,    new NextcloudArrayDeserializer<>("attachments", Attachment.class))
                 .registerTypeAdapter(attachment,        new NextcloudDeserializer<>("attachment", Attachment.class))
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
index 6dedefa01..2bd7764e9 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
@@ -54,8 +54,6 @@ public class JsonToEntityParser {
             return (T) parseCapabilities(obj);
         } else if (mType == OcsUserList.class) {
             return (T) parseOcsUserList(obj);
-        } else if (mType == OcsUser.class) {
-            return (T) parseOcsUser(obj);
         } else if (mType == Attachment.class) {
             return (T) parseAttachment(obj);
         } else if (mType == OcsComment.class) {
@@ -64,25 +62,6 @@ public class JsonToEntityParser {
         throw new IllegalArgumentException("unregistered type: " + mType.getCanonicalName());
     }
 
-    private static OcsUser parseOcsUser(JsonObject obj) {
-        DeckLog.verbose(obj.toString());
-        OcsUser ocsUser = new OcsUser();
-        TraceableException.makeTraceableIfFails(() -> {
-            JsonElement data = obj.get("ocs").getAsJsonObject().get("data");
-            if (!data.isJsonNull()) {
-                JsonObject jsonObject = data.getAsJsonObject();
-                if (jsonObject.has("id")) {
-                    ocsUser.setId(getNullAsEmptyString(jsonObject.get("id")));
-                }
-                if (jsonObject.has("displayname")) {
-                    ocsUser.setDisplayName(getNullAsEmptyString(jsonObject.get("displayname")));
-                }
-            }
-
-        }, obj);
-        return ocsUser;
-    }
-
     private static OcsUserList parseOcsUserList(JsonObject obj) {
         DeckLog.verbose(obj.toString());
         OcsUserList ocsUserList = new OcsUserList();
@@ -92,7 +71,14 @@ public class JsonToEntityParser {
                 JsonElement users = data.getAsJsonObject().get("users");
                 if (!users.isJsonNull() && users.isJsonArray()) {
                     for (JsonElement userElement : users.getAsJsonArray()) {
-                        ocsUserList.add(userElement.getAsString());
+                        JsonObject singleUserElement = userElement.getAsJsonObject();
+                        OcsUser user = new OcsUser();
+                        user.setDisplayName(singleUserElement.get("label").getAsString());
+                        user.setId(
+                                singleUserElement.get("value").getAsJsonObject()
+                                        .get("shareWith").getAsString()
+                        );
+                        ocsUserList.addUser(user);
                     }
                 }
             }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java
index d69ee8513..67a70aba4 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java
@@ -8,7 +8,6 @@ import it.niedermann.nextcloud.deck.model.ocs.Activity;
 import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 import it.niedermann.nextcloud.deck.model.ocs.comment.DeckComment;
 import it.niedermann.nextcloud.deck.model.ocs.comment.OcsComment;
-import it.niedermann.nextcloud.deck.model.ocs.user.OcsUser;
 import it.niedermann.nextcloud.deck.model.ocs.user.OcsUserList;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
@@ -24,11 +23,8 @@ public interface NextcloudServerAPI {
     @GET("cloud/capabilities?format=json")
     Observable<Capabilities> getCapabilities();
 
-    @GET("cloud/users?format=json")
-    Observable<OcsUserList> getAllUsers();
-
-    @GET("cloud/users/{uid}?format=json")
-    Observable<OcsUser> getUserDetails(@Path("uid") String uid);
+    @GET("apps/files_sharing/api/v1/sharees?format=json&perPage=20&itemType=0%2C1%2C7")
+    Observable<OcsUserList> searchUser(@Query("search") String searchTerm);
 
     @GET("apps/activity/api/v2/activity/filter?format=json&object_type=deck_card&limit=50&since=-1&sort=asc")
     Observable<List<Activity>> getActivitiesForCard(@Query("object_id") long cardId);