Merge pull request #1645 from nextcloud/drop-nextcloud-17 (3d422b28) · Commits · e / os / Nextcloud Android Library

library/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.os.Parcelable;
		import androidx.annotation.NonNull;

		public class OwnCloudVersion implements Comparable<OwnCloudVersion>, 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 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion>, Parcelable
		return versionValue;
		}

		public boolean isShareesOnDavSupported() {
		return isNewerOrEqual(nextcloud_17);
		}

		public boolean isRemoteWipeSupported() {
		return isNewerOrEqual(nextcloud_17);
		}

		/*
		* Autogenerated Parcelable
		*/

+4 −14

Original line number	Diff line number	Diff line
		@@ -16,13 +16,13 @@ import org.junit.Test;
		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 class OwnCloudVersionTest {
		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");