Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8275bbef authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge pull request #226 from nextcloud/talkOptional 

Make talk optional
parents 6653bbd7 e5fd7c67

src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java

+16 −2
Original line number Diff line number Diff line
@@ -146,12 +146,26 @@ public class GetRemoteShareesOperation extends RemoteOperation{ 
                JSONArray respExactUsers = respExact.getJSONArray(NODE_USERS);

                JSONArray respExactGroups = respExact.getJSONArray(NODE_GROUPS);

                JSONArray respExactRemotes = respExact.getJSONArray(NODE_REMOTES);

                JSONArray respExactRooms = respExact.getJSONArray(NODE_ROOMS);



                JSONArray respExactRooms;

                if (respExact.has(NODE_ROOMS)) {

                    respExactRooms = respExact.getJSONArray(NODE_ROOMS);

                } else {

                    respExactRooms = new JSONArray();

                }

                JSONArray respExactEmails = respExact.getJSONArray(NODE_EMAILS);

                JSONArray respPartialUsers = respData.getJSONArray(NODE_USERS);

                JSONArray respPartialGroups = respData.getJSONArray(NODE_GROUPS);

                JSONArray respPartialRemotes = respData.getJSONArray(NODE_REMOTES);

                JSONArray respPartialRooms = respData.getJSONArray(NODE_ROOMS);



                JSONArray respPartialRooms;

                

                if (respData.has(NODE_ROOMS)) {

                    respPartialRooms = respData.getJSONArray(NODE_ROOMS);

                } else {

                    respPartialRooms = new JSONArray();

                }

                

                JSONArray[] jsonResults = {

                        respExactUsers,

                        respExactGroups,