#1167 Use retrofit also for capabilities endpoint

2 files changed, 29 insertions, 5 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java
index 761d0dc3..94c5408d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java
@@ -3,6 +3,7 @@ package it.niedermann.owncloud.notes.shared.model;
 
 import androidx.annotation.NonNull;
 
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -10,14 +11,17 @@ import java.util.regex.Pattern;
 public class ApiVersion implements Comparable<ApiVersion> {
     private static final Pattern NUMBER_EXTRACTION_PATTERN = Pattern.compile("[0-9]+");
 
+    public static final ApiVersion API_VERSION_0_2 = new ApiVersion(0, 2);
+    public static final ApiVersion API_VERSION_1_0 = new ApiVersion(1, 0);
+
     public static final ApiVersion[] SUPPORTED_API_VERSIONS = new ApiVersion[]{
-            new ApiVersion(1, 0),
-            new ApiVersion(0, 2)
+            API_VERSION_1_0,
+            API_VERSION_0_2
     };
 
     private String originalVersion = "?";
-    private int major;
-    private int minor;
+    private final int major;
+    private final int minor;
 
     public ApiVersion(String originalVersion, int major, int minor) {
         this(major, minor);
@@ -70,7 +74,7 @@ public class ApiVersion implements Comparable<ApiVersion> {
      * 1 if the compared major version is <strong>lower</strong> than the current major version
      */
     @Override
-    public int compareTo(ApiVersion compare) {
+    public int compareTo(@NonNull ApiVersion compare) {
         if (compare.getMajor() > getMajor()) {
             return -1;
         } else if (compare.getMajor() < getMajor()) {
@@ -79,6 +83,19 @@ public class ApiVersion implements Comparable<ApiVersion> {
         return 0;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ApiVersion that = (ApiVersion) o;
+        return compareTo(that) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(major, minor);
+    }
+
     @NonNull
     @Override
     public String toString() {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/SyncResultStatus.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/SyncResultStatus.java
index 2031568b..41ba850a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/SyncResultStatus.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/SyncResultStatus.java
@@ -3,4 +3,11 @@ package it.niedermann.owncloud.notes.shared.model;
 public class SyncResultStatus {
     public boolean pullSuccessful = true;
     public boolean pushSuccessful = true;
+
+    public static final SyncResultStatus FAILED = new SyncResultStatus();
+
+    static {
+        FAILED.pullSuccessful = false;
+        FAILED.pushSuccessful = false;
+    }
 }