Skip to content

Commit c8d8678

Browse files
Drop NC19
Signed-off-by: tobiasKaminsky <[email protected]>
1 parent 96edde8 commit c8d8678

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed

library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,7 @@ public void testGetRemoteCapabilitiesOperationEtag() {
5858
assertTrue(resultEtag.getData() != null && resultEtag.getData().size() == 1);
5959

6060
OCCapability sameCapability = (OCCapability) resultEtag.getData().get(0);
61-
62-
if (capability.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_19)) {
63-
assertEquals(capability, sameCapability);
64-
} else {
65-
assertEquals(capability.getEtag(), sameCapability.getEtag());
66-
}
61+
assertEquals(capability.getEtag(), sameCapability.getEtag());
6762

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

9893
OCCapability sameCapability = (OCCapability) resultEtag.getData().get(0);
99-
100-
if (capability.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_19)) {
101-
assertEquals(capability, sameCapability);
102-
} else {
103-
assertEquals(capability.getEtag(), sameCapability.getEtag());
104-
}
94+
assertEquals(capability.getEtag(), sameCapability.getEtag());
10595

10696
checkCapability(capability, nextcloudClient.getUserId());
10797
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import androidx.annotation.NonNull;
2121

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

2725
private static final int MAX_DOTS = 3;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
public class OwnCloudVersionTest {
1717
@Test
1818
public void testOwnCloudVersion() {
19-
OwnCloudVersion version = new OwnCloudVersion("18.0.0");
20-
21-
assertEquals(0, version.compareTo(OwnCloudVersion.nextcloud_18));
19+
OwnCloudVersion version = new OwnCloudVersion("31.0.0");
20+
21+
assertEquals(0, version.compareTo(NextcloudVersion.nextcloud_31));
2222

23-
version = new OwnCloudVersion("18.99.99");
23+
version = new OwnCloudVersion("31.99.99");
2424

25-
assertEquals(0, version.compareTo(new OwnCloudVersion(0x12636300))); // 18.99.99 in hex
25+
assertEquals(0, version.compareTo(new OwnCloudVersion(0x1F636300))); // 18.99.99 in hex
2626
}
2727

2828
@Test

0 commit comments

Comments
 (0)