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

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

Merge pull request #1672 from nextcloud/bugfix/use-long-for-GetActivitiesRemoteOperation 

BugFix - Use Long For X-Activity-Last-Given
parents 2d0ee93b fb48d01e

library/src/androidTest/java/com/nextcloud/lib/resources/users/GetActivitiesRemoteOperationIT.kt

+2 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ package com.nextcloud.lib.resources.users 


import com.owncloud.android.AbstractIT

import com.owncloud.android.lib.resources.activities.GetActivitiesRemoteOperation

import com.owncloud.android.lib.resources.activities.model.Activity

import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation

import org.junit.Assert.assertTrue

import org.junit.Test
@@ -23,8 +22,8 @@ class GetActivitiesRemoteOperationIT : AbstractIT() { 
        val result = nextcloudClient.execute(GetActivitiesRemoteOperation())

        assertTrue(result.isSuccess)



        val activities = result.data[0] as ArrayList<Activity>

        val lastGiven = result.data[1] as Integer

        val activities = result.data[0] as ArrayList<*>

        val lastGiven = result.data[1] as Long



        assertTrue(activities.isNotEmpty())

        assertTrue(lastGiven > 0)

library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java

+4 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class GetActivitiesRemoteOperation extends RemoteOperation { 


    private static final String NODE_DATA = "data";



    private int lastGiven = -1;

    private long lastGiven = -1;

    

    private long fileId = -1;
@@ -65,7 +65,7 @@ public class GetActivitiesRemoteOperation extends RemoteOperation { 
        this.fileId = fileId;

    }



    public GetActivitiesRemoteOperation(long fileId, int lastGiven) {

    public GetActivitiesRemoteOperation(long fileId, long lastGiven) {

        this.fileId = fileId;

        this.lastGiven = lastGiven;

    }
@@ -114,7 +114,7 @@ public class GetActivitiesRemoteOperation extends RemoteOperation { 
            if (isSuccess(status)) {

                String nextPageHeader = get.getResponseHeader("X-Activity-Last-Given");

                if (nextPageHeader != null) {

                    lastGiven = Integer.parseInt(nextPageHeader);

                    lastGiven = Long.parseLong(nextPageHeader);

                } else {

                    lastGiven = -1;

                }
@@ -185,7 +185,7 @@ public class GetActivitiesRemoteOperation extends RemoteOperation { 


            Header nextPageHeader = get.getResponseHeader("X-Activity-Last-Given");

            if (nextPageHeader != null) {

                lastGiven = Integer.parseInt(nextPageHeader.getValue());

                lastGiven = Long.parseLong(nextPageHeader.getValue());

            } else {

                lastGiven = -1;

            }