From c61797c9f79df1c207662afbc595307864234940 Mon Sep 17 00:00:00 2001 From: xavi-b Date: Sat, 7 Jun 2025 09:28:32 +0200 Subject: [PATCH] Add federated groups --- .../owncloud/android/lib/common/network/WebdavEntry.kt | 1 + .../lib/resources/shares/GetShareesRemoteOperation.java | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt index c0ccf03191..0d4d893eea 100644 --- a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt +++ b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt @@ -556,6 +556,7 @@ class WebdavEntry constructor( ShareType.EMAIL == shareType || ShareType.FEDERATED == shareType || ShareType.GROUP == shareType || + ShareType.FEDERATED_GROUP == shareType || ShareType.ROOM == shareType return if ((isSupportedShareType || displayName.isNotEmpty()) && userId.isNotEmpty()) { ShareeUser(userId, displayName, shareType) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareesRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareesRemoteOperation.java index f7f1523927..ffa5f00305 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareesRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareesRemoteOperation.java @@ -73,6 +73,7 @@ public class GetShareesRemoteOperation extends RemoteOperation> run(OwnCloudClient client JSONArray respExactUsers = respExact.getJSONArray(NODE_USERS); JSONArray respExactGroups = respExact.getJSONArray(NODE_GROUPS); JSONArray respExactRemotes = respExact.getJSONArray(NODE_REMOTES); + JSONArray respExactRemoteGroups = respExact.getJSONArray(NODE_REMOTE_GROUPS); JSONArray respExactCircles; if (respExact.has(NODE_CIRCLES)) { respExactCircles = respExact.getJSONArray(NODE_CIRCLES); @@ -156,6 +158,7 @@ protected RemoteOperationResult> run(OwnCloudClient client JSONArray respPartialUsers = respData.getJSONArray(NODE_USERS); JSONArray respPartialGroups = respData.getJSONArray(NODE_GROUPS); JSONArray respPartialRemotes = respData.getJSONArray(NODE_REMOTES); + JSONArray respPartialRemoteGroups = respData.getJSONArray(NODE_REMOTE_GROUPS); JSONArray respPartialCircles; if (respData.has(NODE_CIRCLES)) { @@ -165,23 +168,25 @@ protected RemoteOperationResult> run(OwnCloudClient client } JSONArray respPartialRooms; - + if (respData.has(NODE_ROOMS)) { respPartialRooms = respData.getJSONArray(NODE_ROOMS); } else { respPartialRooms = new JSONArray(); } - + JSONArray[] jsonResults = { respExactUsers, respExactGroups, respExactRemotes, + respExactRemoteGroups, respExactRooms, respExactEmails, respExactCircles, respPartialUsers, respPartialGroups, respPartialRemotes, + respPartialRemoteGroups, respPartialRooms, respPartialCircles };