From 0ae51a13cd9e01e246e273ae88663ebbf190c020 Mon Sep 17 00:00:00 2001 From: ZetaTom <70907959+ZetaTom@users.noreply.github.com> Date: Wed, 22 Jan 2025 15:34:43 +0100 Subject: [PATCH] Drop support for Nextcloud 17 Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com> --- .../lib/resources/status/OwnCloudVersion.java | 9 --------- .../resources/status/OwnCloudVersionTest.java | 18 ++++-------------- 2 files changed, 4 insertions(+), 23 deletions(-) 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 01962a886..de5575028 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,7 +20,6 @@ import androidx.annotation.NonNull; public class OwnCloudVersion implements Comparable, Parcelable { - public static final OwnCloudVersion nextcloud_17 = new OwnCloudVersion(0x11000000); // 17.0 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 @@ -115,14 +114,6 @@ static protected int getParsedVersion(String version) throws NumberFormatExcepti return versionValue; } - public boolean isShareesOnDavSupported() { - return isNewerOrEqual(nextcloud_17); - } - - public boolean isRemoteWipeSupported() { - return isNewerOrEqual(nextcloud_17); - } - /* * Autogenerated Parcelable */ 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 abbf990c7..85fa21f97 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("17.0.0"); + OwnCloudVersion version = new OwnCloudVersion("18.0.0"); - assertEquals(0, version.compareTo(OwnCloudVersion.nextcloud_17)); + assertEquals(0, version.compareTo(OwnCloudVersion.nextcloud_18)); - version = new OwnCloudVersion("17.99.99"); + version = new OwnCloudVersion("18.99.99"); - assertEquals(0, version.compareTo(new OwnCloudVersion(0x11636300))); // 13.99.99 in hex + assertEquals(0, version.compareTo(new OwnCloudVersion(0x12636300))); // 18.99.99 in hex } @Test @@ -49,16 +49,6 @@ public void testOwnCloudVersionFailure() { assertFalse(version.isVersionValid()); } - @Test - public void testSupportNC17() { - assertTrue(OwnCloudVersion.nextcloud_17.isShareesOnDavSupported()); - } - - @Test - public void testSupportNC18() { - assertTrue(OwnCloudVersion.nextcloud_18.isShareesOnDavSupported()); - } - @Test public void testSupportNC21() { OwnCloudVersion version = new OwnCloudVersion("21.0.0");