mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-25 14:45:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

better localId

Browse source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2021-06-11 12:25:21 +02:00
parent fcb1e072a2
commit 4e508a9e8b
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/owncloud/android/datamodel/OCFile.java
View file

@ -552,7 +552,8 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
* @return file fileId, unique within the instance
*/
public String getLocalId() {
return getRemoteId().substring(0, 8).replaceAll("^0*", "");
// fileId, instanceId. instanceId is 12 chars long
return getRemoteId().substring(0, getRemoteId().length() - 12).replaceAll("^0*", "");
}
public boolean isInConflict() {

43
src/test/java/com/owncloud/android/datamodel/OCFileTest.java Normal file
View file

@ -0,0 +1,43 @@
/*
*
* Nextcloud Android client application
*
* @author Tobias Kaminsky
* Copyright (C) 2021 Tobias Kaminsky
* Copyright (C) 2021 Nextcloud GmbH
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.owncloud.android.datamodel;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class OCFileTest {
@Test
public void testLongIds() {
OCFile sut = new OCFile("/", "12345678ocjycgrudn78");
assertEquals("12345678", sut.getLocalId());
sut.setRemoteId("00000008ocjycgrudn78");
assertEquals("8", sut.getLocalId());
sut.setRemoteId("1234567891011ocjycgrudn78");
assertEquals("1234567891011", sut.getLocalId());
}
}