Skip to content

BugFix - Use Long For X-Activity-Last-Given #1672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 2 commits into from
Apr 9, 2025
Merged

BugFix - Use Long For X-Activity-Last-Given #1672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f52ffb5
use long for lastGiven
alperozturk96 Feb 20, 2025
fb48d01
fix test
alperozturk96 Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .../src/androidTest/java/com/nextcloud/lib/resources/users/GetActivitiesRemoteOperationIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions ...main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -65,7 +65,7 @@ public GetActivitiesRemoteOperation(long fileId) {
this.fileId = fileId;
}

public GetActivitiesRemoteOperation(long fileId, int lastGiven) {
public GetActivitiesRemoteOperation(long fileId, long lastGiven) {
this.fileId = fileId;
this.lastGiven = lastGiven;
}
Expand Down Expand Up @@ -114,7 +114,7 @@ public RemoteOperationResult run(NextcloudClient client) {
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;
}
Expand Down Expand Up @@ -185,7 +185,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {

Header nextPageHeader = get.getResponseHeader("X-Activity-Last-Given");
if (nextPageHeader != null) {
lastGiven = Integer.parseInt(nextPageHeader.getValue());
lastGiven = Long.parseLong(nextPageHeader.getValue());
} else {
lastGiven = -1;
}
Expand Down
Loading