VladPolskiy/nextcloud-android-library
1
0
Fork 0
mirror of https://github.com/nextcloud/android-library.git synced 2025-07-29 12:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1739 from xavi-b/master

Browse Source 
Add federated groups
This commit is contained in:
Tobias Kaminsky
2025-07-04 11:11:24 +02:00
committed by GitHub
parent 1f880cc897 c61797c9f7
commit 10ac44fe9d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt
View File

@ -556,6 +556,7 @@ class WebdavEntry constructor(
ShareType.EMAIL == shareType || ShareType.EMAIL == shareType ||
ShareType.FEDERATED == shareType || ShareType.FEDERATED == shareType ||
ShareType.GROUP == shareType || ShareType.GROUP == shareType ||
ShareType.FEDERATED_GROUP == shareType ||
ShareType.ROOM == shareType ShareType.ROOM == shareType
return if ((isSupportedShareType || displayName.isNotEmpty()) && userId.isNotEmpty()) { return if ((isSupportedShareType || displayName.isNotEmpty()) && userId.isNotEmpty()) {
ShareeUser(userId, displayName, shareType) ShareeUser(userId, displayName, shareType)

5
library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareesRemoteOperation.java
View File

@ -73,6 +73,7 @@ public class GetShareesRemoteOperation extends RemoteOperation<ArrayList<JSONObj
private static final String NODE_USERS = "users"; private static final String NODE_USERS = "users";
private static final String NODE_GROUPS = "groups"; private static final String NODE_GROUPS = "groups";
private static final String NODE_REMOTES = "remotes"; private static final String NODE_REMOTES = "remotes";
private static final String NODE_REMOTE_GROUPS = "remote_groups";
private static final String NODE_EMAILS = "emails"; private static final String NODE_EMAILS = "emails";
private static final String NODE_ROOMS = "rooms"; private static final String NODE_ROOMS = "rooms";
private static final String NODE_CIRCLES = "circles"; private static final String NODE_CIRCLES = "circles";
@ -138,6 +139,7 @@ public class GetShareesRemoteOperation extends RemoteOperation<ArrayList<JSONObj
JSONArray respExactUsers = respExact.getJSONArray(NODE_USERS); JSONArray respExactUsers = respExact.getJSONArray(NODE_USERS);
JSONArray respExactGroups = respExact.getJSONArray(NODE_GROUPS); JSONArray respExactGroups = respExact.getJSONArray(NODE_GROUPS);
JSONArray respExactRemotes = respExact.getJSONArray(NODE_REMOTES); JSONArray respExactRemotes = respExact.getJSONArray(NODE_REMOTES);
JSONArray respExactRemoteGroups = respExact.getJSONArray(NODE_REMOTE_GROUPS);
JSONArray respExactCircles; JSONArray respExactCircles;
if (respExact.has(NODE_CIRCLES)) { if (respExact.has(NODE_CIRCLES)) {
respExactCircles = respExact.getJSONArray(NODE_CIRCLES); respExactCircles = respExact.getJSONArray(NODE_CIRCLES);
@ -156,6 +158,7 @@ public class GetShareesRemoteOperation extends RemoteOperation<ArrayList<JSONObj
JSONArray respPartialUsers = respData.getJSONArray(NODE_USERS); JSONArray respPartialUsers = respData.getJSONArray(NODE_USERS);
JSONArray respPartialGroups = respData.getJSONArray(NODE_GROUPS); JSONArray respPartialGroups = respData.getJSONArray(NODE_GROUPS);
JSONArray respPartialRemotes = respData.getJSONArray(NODE_REMOTES); JSONArray respPartialRemotes = respData.getJSONArray(NODE_REMOTES);
JSONArray respPartialRemoteGroups = respData.getJSONArray(NODE_REMOTE_GROUPS);
JSONArray respPartialCircles; JSONArray respPartialCircles;
if (respData.has(NODE_CIRCLES)) { if (respData.has(NODE_CIRCLES)) {
@ -176,12 +179,14 @@ public class GetShareesRemoteOperation extends RemoteOperation<ArrayList<JSONObj
respExactUsers, respExactUsers,
respExactGroups, respExactGroups,
respExactRemotes, respExactRemotes,
respExactRemoteGroups,
respExactRooms, respExactRooms,
respExactEmails, respExactEmails,
respExactCircles, respExactCircles,
respPartialUsers, respPartialUsers,
respPartialGroups, respPartialGroups,
respPartialRemotes, respPartialRemotes,
respPartialRemoteGroups,
respPartialRooms, respPartialRooms,
respPartialCircles respPartialCircles
}; };