From ea26e43c0d173aef2346301cb1e9398ec4bd9da7 Mon Sep 17 00:00:00 2001 From: masensio Date: Thu, 29 Oct 2015 10:42:57 +0100 Subject: [PATCH] GetRemoteShareeOperation returns ArrayList with Users and Groups --- .../shares/GetRemoteShareesOperation.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java index 9045fc88..6809fac6 100644 --- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java +++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java @@ -88,9 +88,10 @@ 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_VALUE = "value"; - private static final String PROPERTY_LABEL = "label"; - private static final String PROPERTY_SHARE_TYPE = "shareType"; + public static final String NODE_VALUE = "value"; + public static final String PROPERTY_LABEL = "label"; + public static final String PROPERTY_SHARE_TYPE = "shareType"; + public static final String PROPERTY_SHARE_WITH = "shareWith"; // Result types public static final Byte USER_TYPE = 0; @@ -156,16 +157,16 @@ public class GetRemoteShareesOperation extends RemoteOperation{ }; ArrayList data = new ArrayList(); // For result data - Pair match; +// Pair match; for (int i=0; i<4; i++) { for(int j=0; j< jsonResults[i].length(); j++){ JSONObject jsonResult = jsonResults[i].getJSONObject(j); - match = new Pair( - jsonResult.getString(PROPERTY_LABEL), - (byte)jsonResult.getJSONObject(NODE_VALUE).getInt(PROPERTY_SHARE_TYPE) - ); - data.add(match); - Log_OC.d(TAG, "*** Added item: " + match.first); +// match = new Pair( +// jsonResult.getString(PROPERTY_LABEL), +// (byte)jsonResult.getJSONObject(NODE_VALUE).getInt(PROPERTY_SHARE_TYPE) +// ); + data.add(jsonResult); + Log_OC.d(TAG, "*** Added item: " + jsonResult.getString(PROPERTY_LABEL)); } }