Skip to content

fix(activity): Use long as id for activity #2166

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CarlSchwan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(activity): Use long as id for activity #2166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 0 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 @@ -70,6 +70,11 @@ public GetActivitiesRemoteOperation(long fileId, long lastGiven) {
this.lastGiven = lastGiven;
}

/**
* @deprecated an int cannot hold all activity IDs, use {@link #GetActivitiesRemoteOperation(long, long)}
* with a fileId of -1 instead
*/
@Deprecated
public GetActivitiesRemoteOperation(int lastGiven) {

@alperozturk96 alperozturk96 Oct 12, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to break existing usage thus we can update client code?

this.lastGiven = lastGiven;
}
Expand Down
3 changes: 2 additions & 1 deletion library/src/main/java/com/owncloud/android/lib/resources/activities/model/Activity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ import java.util.Date
* Activity Data Model
*/
data class Activity(
// Accepts both a JSON number and a numeric string; Snowflake IDs need more than 32 bits
@SerializedName("activity_id")
val activityId: Int,
val activityId: Long,
val datetime: Date,
// legacy purposes
val date: Date,
Expand Down
16 changes: 16 additions & 0 deletions .../java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,22 @@ public void testParseActivities() {
assertEquals("0", firstItem.getObjectId());
}

@Test
public void testParseActivityIdsBeyondInt() {
String activities = "{\"ocs\":{\"meta\":{\"status\":\"ok\",\"statuscode\":200,\"message\":\"OK\"}," +
"\"data\":[{\"activity_id\":130000000000000123,\"user\":\"test\"}," +
"{\"activity_id\":\"130000000000000124\",\"user\":\"test\"}," +
"{\"activity_id\":\"42\",\"user\":\"test\"}]}}";

GetActivitiesRemoteOperation sut = new GetActivitiesRemoteOperation();
ArrayList<Activity> activityList = sut.parseResult(activities);

assertEquals(3, activityList.size());
assertEquals(130000000000000123L, activityList.get(0).getActivityId());
assertEquals(130000000000000124L, activityList.get(1).getActivityId());
assertEquals(42L, activityList.get(2).getActivityId());
}

@Test
public void testEmptyString() {
String activities = "";
Expand Down
Loading