Merge pull request #376 from nextcloud/remove12 (903d50f8) · Commits · e / os / Nextcloud Android Library

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

+1 −12

Original line number	Diff line number	Diff line
		@@ -29,21 +29,18 @@ import android.os.Parcel;
		import android.os.Parcelable;

		import androidx.annotation.NonNull;

		import lombok.EqualsAndHashCode;
		import lombok.Getter;

		@EqualsAndHashCode
		public class OwnCloudVersion implements Comparable<OwnCloudVersion>, Parcelable {
		public static final OwnCloudVersion nextcloud_12 = new OwnCloudVersion(0x0C000000); // 12.0
		public static final OwnCloudVersion nextcloud_13 = new OwnCloudVersion(0x0D000000); // 13.0
		public static final OwnCloudVersion nextcloud_14 = new OwnCloudVersion(0x0E000000); // 14.0
		public static final OwnCloudVersion nextcloud_15 = new OwnCloudVersion(0x0F000000); // 15.0
		public static final OwnCloudVersion nextcloud_16 = new OwnCloudVersion(0x10000000); // 16.0
		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 int MINIMUM_VERSION_FOR_SEARCH_API = nextcloud_12.version;
		public static final int MINIMUM_VERSION_FOR_WEB_LOGIN = nextcloud_12.version;
		public static final int MINIMUM_VERSION_FOR_MEDIA_STREAMING = nextcloud_14.version; // 14.0
		public static final int MINIMUM_VERSION_FOR_NOTE_ON_SHARE = nextcloud_14.version; // 14.0

		@@ -133,14 +130,6 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion>, Parcelable
		return versionValue;
		}

		public boolean isSearchSupported() {
		return (version >= MINIMUM_VERSION_FOR_SEARCH_API);
		}

		public boolean isWebLoginSupported() {
		return version >= MINIMUM_VERSION_FOR_WEB_LOGIN;
		}

		public boolean isMediaStreamingSupported() {
		return version >= MINIMUM_VERSION_FOR_MEDIA_STREAMING;
		}

src/test/java/com/owncloud/android/lib/resources/status/OwnCloudVersionTest.java

+12 −26

Original line number	Diff line number	Diff line
		@@ -36,13 +36,13 @@ import static org.junit.Assert.assertTrue;
		public class OwnCloudVersionTest {
		@Test
		public void testOwnCloudVersion() {
		OwnCloudVersion version = new OwnCloudVersion("12.0.0");
		OwnCloudVersion version = new OwnCloudVersion("13.0.0");

		assertEquals(0, version.compareTo(OwnCloudVersion.nextcloud_12));
		assertEquals(0, version.compareTo(OwnCloudVersion.nextcloud_13));

		version = new OwnCloudVersion("12.99.99");
		version = new OwnCloudVersion("13.99.99");

		assertEquals(0, version.compareTo(new OwnCloudVersion(0x0C636300))); // 12.99.99 in hex
		assertEquals(0, version.compareTo(new OwnCloudVersion(0x0D636300))); // 13.99.99 in hex
		}

		@Test
		@@ -69,30 +69,14 @@ public class OwnCloudVersionTest {
		assertFalse(version.isVersionValid());
		}

		@Test
		public void testSupportNC12() {
		assertTrue(OwnCloudVersion.nextcloud_12.isSearchSupported());
		assertTrue(OwnCloudVersion.nextcloud_12.isWebLoginSupported());
		assertFalse(OwnCloudVersion.nextcloud_12.isMediaStreamingSupported());
		assertFalse(OwnCloudVersion.nextcloud_12.isNoteOnShareSupported());
		assertFalse(OwnCloudVersion.nextcloud_12.isHideFileDownloadSupported());
		assertFalse(OwnCloudVersion.nextcloud_12.isShareesOnDavSupported());
		}

		@Test
		public void testSupportNC13() {
		assertTrue(OwnCloudVersion.nextcloud_13.isSearchSupported());
		assertTrue(OwnCloudVersion.nextcloud_13.isWebLoginSupported());
		assertFalse(OwnCloudVersion.nextcloud_13.isMediaStreamingSupported());
		assertFalse(OwnCloudVersion.nextcloud_13.isNoteOnShareSupported());
		assertFalse(OwnCloudVersion.nextcloud_12.isHideFileDownloadSupported());
		assertFalse(OwnCloudVersion.nextcloud_12.isShareesOnDavSupported());
		}

		@Test
		public void testSupportNC14() {
		assertTrue(OwnCloudVersion.nextcloud_14.isSearchSupported());
		assertTrue(OwnCloudVersion.nextcloud_14.isWebLoginSupported());
		assertTrue(OwnCloudVersion.nextcloud_14.isMediaStreamingSupported());
		assertTrue(OwnCloudVersion.nextcloud_14.isNoteOnShareSupported());
		assertFalse(OwnCloudVersion.nextcloud_14.isHideFileDownloadSupported());
		@@ -101,8 +85,6 @@ public class OwnCloudVersionTest {

		@Test
		public void testSupportNC15() {
		assertTrue(OwnCloudVersion.nextcloud_15.isSearchSupported());
		assertTrue(OwnCloudVersion.nextcloud_15.isWebLoginSupported());
		assertTrue(OwnCloudVersion.nextcloud_15.isMediaStreamingSupported());
		assertTrue(OwnCloudVersion.nextcloud_15.isNoteOnShareSupported());
		assertTrue(OwnCloudVersion.nextcloud_15.isHideFileDownloadSupported());
		@@ -111,8 +93,6 @@ public class OwnCloudVersionTest {

		@Test
		public void testSupportNC16() {
		assertTrue(OwnCloudVersion.nextcloud_16.isSearchSupported());
		assertTrue(OwnCloudVersion.nextcloud_16.isWebLoginSupported());
		assertTrue(OwnCloudVersion.nextcloud_16.isMediaStreamingSupported());
		assertTrue(OwnCloudVersion.nextcloud_16.isNoteOnShareSupported());
		assertTrue(OwnCloudVersion.nextcloud_16.isHideFileDownloadSupported());
		@@ -121,11 +101,17 @@ public class OwnCloudVersionTest {

		@Test
		public void testSupportNC17() {
		assertTrue(OwnCloudVersion.nextcloud_17.isSearchSupported());
		assertTrue(OwnCloudVersion.nextcloud_17.isWebLoginSupported());
		assertTrue(OwnCloudVersion.nextcloud_17.isMediaStreamingSupported());
		assertTrue(OwnCloudVersion.nextcloud_17.isNoteOnShareSupported());
		assertTrue(OwnCloudVersion.nextcloud_17.isHideFileDownloadSupported());
		assertTrue(OwnCloudVersion.nextcloud_17.isShareesOnDavSupported());
		}

		@Test
		public void testSupportNC18() {
		assertTrue(OwnCloudVersion.nextcloud_18.isMediaStreamingSupported());
		assertTrue(OwnCloudVersion.nextcloud_18.isNoteOnShareSupported());
		assertTrue(OwnCloudVersion.nextcloud_18.isHideFileDownloadSupported());
		assertTrue(OwnCloudVersion.nextcloud_18.isShareesOnDavSupported());
		}
		}