From 36da2a2336fdee71b544705b6a28b313d7f53e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Gonz=C3=A1lez=20Cabrero?=
<malkomich@gmail.com>
Date: Thu, 3 Mar 2016 12:45:05 +0100
Subject: [PATCH] Parse the lists of remote users from the JSON response of the
server
---
.../resources/shares/GetRemoteShareesOperation.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
index 694febc0..b588e913 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
@@ -78,7 +78,7 @@ public class GetRemoteShareesOperation extends RemoteOperation{
// Arguments - constant values
private static final String VALUE_FORMAT = "json";
- private static final String VALUE_ITEM_TYPE = "search"; // to get the server search for users / groups
+ private static final String VALUE_ITEM_TYPE = "file"; // to get the server search for users / groups
// JSON Node names
@@ -87,6 +87,7 @@ public class GetRemoteShareesOperation extends RemoteOperation{
private static final String NODE_EXACT = "exact";
private static final String NODE_USERS = "users";
private static final String NODE_GROUPS = "groups";
+ private static final String NODE_REMOTES = "remotes";
public static final String NODE_VALUE = "value";
public static final String PROPERTY_LABEL = "label";
public static final String PROPERTY_SHARE_TYPE = "shareType";
@@ -146,17 +147,21 @@ public class GetRemoteShareesOperation extends RemoteOperation{
JSONObject respExact = respData.getJSONObject(NODE_EXACT);
JSONArray respExactUsers = respExact.getJSONArray(NODE_USERS);
JSONArray respExactGroups = respExact.getJSONArray(NODE_GROUPS);
+ JSONArray respExactRemotes = respExact.getJSONArray(NODE_REMOTES);
JSONArray respPartialUsers = respData.getJSONArray(NODE_USERS);
JSONArray respPartialGroups = respData.getJSONArray(NODE_GROUPS);
+ JSONArray respPartialRemotes = respData.getJSONArray(NODE_REMOTES);
JSONArray[] jsonResults = {
respExactUsers,
respExactGroups,
+ respExactRemotes,
respPartialUsers,
- respPartialGroups
+ respPartialGroups,
+ respPartialRemotes
};
ArrayList<Object> data = new ArrayList<Object>(); // For result data
- for (int i=0; i<4; i++) {
+ for (int i=0; i<6; i++) {
for(int j=0; j< jsonResults[i].length(); j++){
JSONObject jsonResult = jsonResults[i].getJSONObject(j);
data.add(jsonResult);