Skip to content

OCFile: parse localId with "oc" split #16253

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

Open
tobiasKaminsky wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −5
Open

OCFile: parse localId with "oc" split #16253

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
4 changes: 2 additions & 2 deletions app/src/main/java/com/owncloud/android/datamodel/OCFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,8 @@ public boolean isHidden() {
public long getLocalId() {
if (localId > 0) {
return localId;
} else if (remoteId != null && remoteId.length() > 8) {
return Long.parseLong(remoteId.substring(0, 8).replaceAll("^0*", ""));
} else if (remoteId != null) {
return Long.parseLong(remoteId.split("oc")[0]);
} else {
return -1;
}
Expand Down
4 changes: 1 addition & 3 deletions app/src/test/java/com/owncloud/android/datamodel/OCFileTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package com.owncloud.android.datamodel

import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotEquals
import org.junit.Test

class OCFileTest {
Expand All @@ -22,9 +21,8 @@ class OCFileTest {
sut.remoteId = "00000008ocjycgrudn78"
assertEquals(8, sut.localId)

// this will fail as fileId is too large
sut.remoteId = "1234567891011ocjycgrudn78"
assertNotEquals(1234567891011L, sut.localId)
assertEquals(1234567891011L, sut.localId)

sut.localId = 1234567891011L
assertEquals(1234567891011L, sut.localId)
Expand Down
Loading