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

Unverified Commit 3a714093 authored by Joas Schilling's avatar Joas Schilling Committed by tobiasKaminsky
Browse files

Also return the next page URL 



Signed-off-by: default avatarJoas Schilling <coding@schilljs.com>
parent ea4b42df

src/com/owncloud/android/lib/resources/activities/GetRemoteActivitiesOperation.java

+11 −3
Original line number Diff line number Diff line
@@ -71,12 +71,16 @@ public class GetRemoteActivitiesOperation extends RemoteOperation{ 


    private String nextUrl = "";



    public void setNextUrl(String url) {

        nextUrl = url;

    }



    @Override

    protected RemoteOperationResult run(OwnCloudClient client) {

        RemoteOperationResult result = null;

        int status = -1;

        GetMethod get = null;

        ArrayList<Object> activities;

        ArrayList<Activity> activities;

        String url;

        if (nextUrl.isEmpty()) {

            if (client.getOwnCloudVersion().compareTo(OwnCloudVersion.nextcloud_12) >= 0) {
@@ -115,7 +119,11 @@ public class GetRemoteActivitiesOperation extends RemoteOperation{ 
                result = new RemoteOperationResult(true, status, get.getResponseHeaders());

                // Parse the response

                activities = parseResult(response);

                result.setData(activities);



                ArrayList<Object> data = new ArrayList<>();

                data.add(activities);

                data.add(nextUrl);

                result.setData(data);

            } else {

                result = new RemoteOperationResult(false, status, get.getResponseHeaders());

                Log_OC.e(TAG, "Failed response while getting user activities ");
@@ -141,7 +149,7 @@ public class GetRemoteActivitiesOperation extends RemoteOperation{ 
        return !nextUrl.isEmpty();

    }



    private ArrayList<Object> parseResult(String response) throws JSONException {

    private ArrayList<Activity> parseResult(String response) throws JSONException {

        JsonParser jsonParser = new JsonParser();

        JsonObject jo = (JsonObject)jsonParser.parse(response);

        JsonArray jsonDataArray = jo.getAsJsonObject(NODE_OCS).getAsJsonArray(NODE_DATA);