From 2c6acca722a0d481cfd9ae3373c91535a025499b Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 28 Aug 2025 07:19:46 +0200 Subject: [PATCH] Drop NC19 Signed-off-by: tobiasKaminsky --- .../android/GetCapabilitiesRemoteOperationIT.java | 14 ++------------ .../lib/resources/status/OwnCloudVersion.java | 2 -- .../lib/resources/status/OwnCloudVersionTest.java | 10 +++++----- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java index 0b8bcda75d..09d005c77b 100644 --- a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java +++ b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java @@ -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()); } @@ -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()); } diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.java b/library/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.java index de55750280..571abd01ad 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.java @@ -20,8 +20,6 @@ import androidx.annotation.NonNull; public class OwnCloudVersion implements Comparable, 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; diff --git a/library/src/test/java/com/owncloud/android/lib/resources/status/OwnCloudVersionTest.java b/library/src/test/java/com/owncloud/android/lib/resources/status/OwnCloudVersionTest.java index 85fa21f977..8759661c25 100644 --- a/library/src/test/java/com/owncloud/android/lib/resources/status/OwnCloudVersionTest.java +++ b/library/src/test/java/com/owncloud/android/lib/resources/status/OwnCloudVersionTest.java @@ -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