Merge branch 'master' into 435-capabilities-etags

4 files changed, 16 insertions, 13 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
index 41303cac6..6f3913f45 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
@@ -6,8 +6,6 @@ import androidx.room.Ignore;
 import androidx.room.Junction;
 import androidx.room.Relation;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -130,7 +128,7 @@ public class FullCard implements IRemoteEntity, DragAndDropModel {
         return card;
     }
 
-    @NotNull
+    @NonNull
     @Override
     public String toString() {
         return "FullCard{" +
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java
index f3892dfa5..a10097c36 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java
@@ -3,8 +3,6 @@ package it.niedermann.nextcloud.deck.model.internal;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -47,7 +45,7 @@ public class FilterInformation implements Serializable {
         return users;
     }
 
-    @NotNull
+    @NonNull
     public List<Label> getLabels() {
         return labels;
     }
@@ -68,7 +66,7 @@ public class FilterInformation implements Serializable {
         users.remove(user);
     }
 
-    @NotNull
+    @NonNull
     @Override
     public String toString() {
         return "FilterInformation{" +
@@ -79,7 +77,7 @@ public class FilterInformation implements Serializable {
     }
 
     /**
-     * @return whether or not the given filterInformation has any actual filters set
+     * @return whether or not the given {@param filterInformation} has any actual filters set
      */
     public static boolean hasActiveFilter(@Nullable FilterInformation filterInformation) {
         if (filterInformation == null) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
index 7ef97a294..c04512ad2 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
@@ -6,8 +6,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -125,7 +123,7 @@ public class Version implements Comparable<Version> {
         return 0;
     }
 
-    @NotNull
+    @NonNull
     @Override
     public String toString() {
         return "Version{" +
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/user/OcsUserList.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/user/OcsUserList.java
index a10ae005d..818d5b96e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/user/OcsUserList.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/user/OcsUserList.java
@@ -1,7 +1,16 @@
 package it.niedermann.nextcloud.deck.model.ocs.user;
 
 import java.util.ArrayList;
+import java.util.List;
 
-public class OcsUserList extends ArrayList<String> {
-    // nothing.
+public class OcsUserList {
+    private List<OcsUser> users = new ArrayList<>();
+
+    public List<OcsUser> getUsers() {
+        return users;
+    }
+
+    public void addUser(OcsUser user) {
+        this.users.add(user);
+    }
 }