Skip to content

Drop NC19 #1813

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 1 commit into from
Oct 20, 2025
Merged

Drop NC19 #1813

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
14 changes: 2 additions & 12 deletions library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,7 @@ public void testGetRemoteCapabilitiesOperationEtag() {
assertTrue(resultEtag.getData() != null && resultEtag.getData().size() == 1);

OCCapability sameCapability = (OCCapability) resultEtag.getData().get(0);

if (capability.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_19)) {
assertEquals(capability, sameCapability);
} else {
assertEquals(capability.getEtag(), sameCapability.getEtag());
}
assertEquals(capability, sameCapability);

checkCapability(capability, client.getUserId());
}
Expand Down Expand Up @@ -96,12 +91,7 @@ public void testGetRemoteCapabilitiesOperationEtagWithNextcloudClient() {
assertTrue(resultEtag.getData() != null && resultEtag.getData().size() == 1);

OCCapability sameCapability = (OCCapability) resultEtag.getData().get(0);

if (capability.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_19)) {
assertEquals(capability, sameCapability);
} else {
assertEquals(capability.getEtag(), sameCapability.getEtag());
}
assertEquals(capability, sameCapability);

checkCapability(capability, nextcloudClient.getUserId());
}
Expand Down
2 changes: 0 additions & 2 deletions library/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import androidx.annotation.NonNull;

public class OwnCloudVersion implements Comparable<OwnCloudVersion>, Parcelable {
public static final OwnCloudVersion nextcloud_18 = new OwnCloudVersion(0x12000000); // 18.0
public static final OwnCloudVersion nextcloud_19 = new OwnCloudVersion(0x13000000); // 19.0
public static final OwnCloudVersion nextcloud_20 = new OwnCloudVersion(0x14000000); // 20.0

private static final int MAX_DOTS = 3;
Expand Down
10 changes: 5 additions & 5 deletions library/src/test/java/com/owncloud/android/lib/resources/status/OwnCloudVersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
public class OwnCloudVersionTest {
@Test
public void testOwnCloudVersion() {
OwnCloudVersion version = new OwnCloudVersion("18.0.0");

assertEquals(0, version.compareTo(OwnCloudVersion.nextcloud_18));
OwnCloudVersion version = new OwnCloudVersion("31.0.0");
assertEquals(0, version.compareTo(NextcloudVersion.nextcloud_31));

version = new OwnCloudVersion("18.99.99");
version = new OwnCloudVersion("31.99.99");

assertEquals(0, version.compareTo(new OwnCloudVersion(0x12636300))); // 18.99.99 in hex
assertEquals(0, version.compareTo(new OwnCloudVersion(0x1F636300))); // 31.99.99 in hex
}

@Test
Expand Down
Loading