From c2f8134e3350d592797eec5dfadfaf28c608790b Mon Sep 17 00:00:00 2001
From: desperateCoder <admin@life-style-art.de>
Date: Fri, 12 Oct 2018 12:17:57 +0200
Subject: refactoring

---
 .../it/niedermann/nextcloud/deck/BoardAdapter.java |   2 +-
 .../it/niedermann/nextcloud/deck/MainActivity.java |   3 +-
 .../it/niedermann/nextcloud/deck/api/DeckAPI.java  |   4 +-
 .../niedermann/nextcloud/deck/api/DeckAPI_SSO.java |   5 +-
 .../niedermann/nextcloud/deck/api/GsonConfig.java  |   4 +-
 .../nextcloud/deck/api/NextcloudDeserializer.java  |   4 +-
 .../it/niedermann/nextcloud/deck/model/Board.java  |  56 +++++++
 .../it/niedermann/nextcloud/deck/model/Card.java   | 175 ++++++++++++++++++++
 .../it/niedermann/nextcloud/deck/model/Label.java  |  46 ++++++
 .../it/niedermann/nextcloud/deck/model/Stack.java  |  59 +++++++
 .../it/niedermann/nextcloud/deck/model/User.java   |  46 ++++++
 .../nextcloud/deck/model/board/Board.java          |  56 -------
 .../nextcloud/deck/model/board/Card.java           | 177 ---------------------
 .../nextcloud/deck/model/board/Label.java          |  46 ------
 .../nextcloud/deck/model/board/Stack.java          |  59 -------
 .../nextcloud/deck/model/board/User.java           |  46 ------
 16 files changed, 392 insertions(+), 396 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java
 create mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
 create mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java
 create mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java
 create mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/User.java
 delete mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/board/Board.java
 delete mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/board/Card.java
 delete mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/board/Label.java
 delete mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/board/Stack.java
 delete mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/board/User.java

(limited to 'app')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/BoardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/BoardAdapter.java
index 3a5cf6cd6..4d31cb008 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/BoardAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/BoardAdapter.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import it.niedermann.nextcloud.deck.model.board.Board;
+import it.niedermann.nextcloud.deck.model.Board;
 
 class BoardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/MainActivity.java
index 0abc1a3a6..fd9278968 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/MainActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/MainActivity.java
@@ -15,7 +15,6 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.TextView;
 
 import com.nextcloud.android.sso.api.NextcloudAPI;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
@@ -28,7 +27,7 @@ import butterknife.ButterKnife;
 import io.reactivex.functions.Consumer;
 import it.niedermann.nextcloud.deck.api.ApiProvider;
 import it.niedermann.nextcloud.deck.model.DataBaseAdapter;
-import it.niedermann.nextcloud.deck.model.board.Board;
+import it.niedermann.nextcloud.deck.model.Board;
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java
index 6d3c760fd..26cfb4ad9 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java
@@ -4,8 +4,8 @@ package it.niedermann.nextcloud.deck.api;
 import java.util.List;
 
 import io.reactivex.Observable;
-import it.niedermann.nextcloud.deck.model.board.Board;
-import it.niedermann.nextcloud.deck.model.board.Card;
+import it.niedermann.nextcloud.deck.model.Board;
+import it.niedermann.nextcloud.deck.model.Card;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java
index b5c78f9b0..bdcb5cfec 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java
@@ -4,12 +4,11 @@ package it.niedermann.nextcloud.deck.api;
 import com.nextcloud.android.sso.aidl.NextcloudRequest;
 import com.nextcloud.android.sso.api.NextcloudAPI;
 
-import java.lang.reflect.Type;
 import java.util.List;
 
 import io.reactivex.Observable;
-import it.niedermann.nextcloud.deck.model.board.Board;
-import it.niedermann.nextcloud.deck.model.board.Card;
+import it.niedermann.nextcloud.deck.model.Board;
+import it.niedermann.nextcloud.deck.model.Card;
 
 public class DeckAPI_SSO implements DeckAPI {
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
index 71e7fc7d8..fb8c09977 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
@@ -6,8 +6,8 @@ import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
 
-import it.niedermann.nextcloud.deck.model.board.Board;
-import it.niedermann.nextcloud.deck.model.board.Card;
+import it.niedermann.nextcloud.deck.model.Board;
+import it.niedermann.nextcloud.deck.model.Card;
 
 /**
  * Created by david on 27.06.17.
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
index 8d233241f..964607a7e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
@@ -11,8 +11,8 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
-import it.niedermann.nextcloud.deck.model.board.Board;
-import it.niedermann.nextcloud.deck.model.board.Card;
+import it.niedermann.nextcloud.deck.model.Board;
+import it.niedermann.nextcloud.deck.model.Card;
 
 /**
  * Created by david on 24.05.17.
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java
new file mode 100644
index 000000000..5b1ce9411
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java
@@ -0,0 +1,56 @@
+package it.niedermann.nextcloud.deck.model;
+
+import it.niedermann.nextcloud.deck.model.DBStatus;
+import it.niedermann.nextcloud.deck.model.RemoteEntity;
+
+public class Board extends RemoteEntity {
+    private long accountId;
+    private String title;
+    private DBStatus status = DBStatus.UP_TO_DATE;
+
+    public Board(long accountId, long remoteId, String title) {
+        super(remoteId);
+        this.accountId = accountId;
+        this.title = title;
+    }
+
+    public Board(long accountId, long id, String title, DBStatus status) {
+        super();
+        this.accountId = accountId;
+        this.id = id;
+        this.title = title;
+        this.status = status;
+    }
+
+    public long getRemoteId() {
+        return remoteId;
+    }
+
+    public void setRemoteId(long remoteId) {
+        this.remoteId = remoteId;
+    }
+
+    public long getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(long accountId) {
+        this.accountId = accountId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public DBStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(DBStatus status) {
+        this.status = status;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
new file mode 100644
index 000000000..63b1a6949
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
@@ -0,0 +1,175 @@
+package it.niedermann.nextcloud.deck.model;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Card extends RemoteEntity {
+
+    private String title;
+    private String description;
+    private long stackId;
+    private String type;
+    private LocalDate lastModified;
+    private LocalDate createdAt;
+    private LocalDate deletedAt;
+    private List<Label> labels = new ArrayList<>();
+    private List<User> assignedUsers;
+    private String attachments;
+    private int attachmentCount;
+    private String owner;
+    private String order;
+    private boolean archived;
+    private String dueDate;
+    private int overdue;
+    private int commentsUnread;
+
+    public Card(long remoteId, String title) {
+        super(remoteId);
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public long getStackId() {
+        return stackId;
+    }
+
+    public void setStackId(long stackId) {
+        this.stackId = stackId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public LocalDate getLastModified() {
+        return lastModified;
+    }
+
+    public void setLastModified(LocalDate lastModified) {
+        this.lastModified = lastModified;
+    }
+
+    public LocalDate getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(LocalDate createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public LocalDate getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(LocalDate deletedAt) {
+        this.deletedAt = deletedAt;
+    }
+
+    public List<Label> getLabels() {
+        return labels;
+    }
+
+    public void setLabels(List<Label> labels) {
+        this.labels = labels;
+    }
+
+    public void addLabel(Label label){
+        this.labels.add(label);
+    }
+
+    public List<User> getAssignedUsers() {
+        return assignedUsers;
+    }
+
+    public void setAssignedUsers(List<User> assignedUsers) {
+        this.assignedUsers = assignedUsers;
+    }
+
+    public void addAssignedUser(User user) {
+        this.assignedUsers.add(user);
+    }
+
+    public String getAttachments() {
+        return attachments;
+    }
+
+    public void setAttachments(String attachments) {
+        this.attachments = attachments;
+    }
+
+    public int getAttachmentCount() {
+        return attachmentCount;
+    }
+
+    public void setAttachmentCount(int attachmentCount) {
+        this.attachmentCount = attachmentCount;
+    }
+
+    public String getOwner() {
+        return owner;
+    }
+
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    public String getOrder() {
+        return order;
+    }
+
+    public void setOrder(String order) {
+        this.order = order;
+    }
+
+    public boolean isArchived() {
+        return archived;
+    }
+
+    public void setArchived(boolean archived) {
+        this.archived = archived;
+    }
+
+    public String getDueDate() {
+        return dueDate;
+    }
+
+    public void setDueDate(String dueDate) {
+        this.dueDate = dueDate;
+    }
+
+    public int getOverdue() {
+        return overdue;
+    }
+
+    public void setOverdue(int overdue) {
+        this.overdue = overdue;
+    }
+
+    public int getCommentsUnread() {
+        return commentsUnread;
+    }
+
+    public void setCommentsUnread(int commentsUnread) {
+        this.commentsUnread = commentsUnread;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java
new file mode 100644
index 000000000..a880c934d
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java
@@ -0,0 +1,46 @@
+package it.niedermann.nextcloud.deck.model;
+
+import it.niedermann.nextcloud.deck.model.RemoteEntity;
+
+public class Label extends RemoteEntity {
+    private String title;
+    private String color;
+    private long boardId;
+    private long cardId;
+
+    public Label() {
+        super();
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public long getBoardId() {
+        return boardId;
+    }
+
+    public void setBoardId(long boardId) {
+        this.boardId = boardId;
+    }
+
+    public long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(long cardId) {
+        this.cardId = cardId;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java
new file mode 100644
index 000000000..8d3658154
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java
@@ -0,0 +1,59 @@
+package it.niedermann.nextcloud.deck.model;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+import it.niedermann.nextcloud.deck.model.DBStatus;
+import it.niedermann.nextcloud.deck.model.RemoteEntity;
+
+public class Stack extends RemoteEntity {
+    private String title;
+    private long boardId;
+    private LocalDate deletedAt;
+    private int order;
+    private DBStatus status = DBStatus.UP_TO_DATE;
+
+    public Stack() {
+        super();
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public long getBoardId() {
+        return boardId;
+    }
+
+    public void setBoardId(long boardId) {
+        this.boardId = boardId;
+    }
+
+    public LocalDate getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(LocalDate deletedAt) {
+        this.deletedAt = deletedAt;
+    }
+
+    public int getOrder() {
+        return order;
+    }
+
+    public void setOrder(int order) {
+        this.order = order;
+    }
+
+    public DBStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(DBStatus status) {
+        this.status = status;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java
new file mode 100644
index 000000000..fda173534
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java
@@ -0,0 +1,46 @@
+package it.niedermann.nextcloud.deck.model;
+
+import java.io.Serializable;
+
+import it.niedermann.nextcloud.deck.model.RemoteEntity;
+
+public class User implements Serializable {
+
+    private String primaryKey;
+    private String uid;
+    private String displayname;
+
+    public User() {
+        super();
+    }
+
+    public User(String primaryKey, String uid, String displayname) {
+        this.primaryKey = primaryKey;
+        this.uid = uid;
+        this.displayname = displayname;
+    }
+
+    public String getPrimaryKey() {
+        return primaryKey;
+    }
+
+    public void setPrimaryKey(String primaryKey) {
+        this.primaryKey = primaryKey;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getDisplayname() {
+        return displayname;
+    }
+
+    public void setDisplayname(String displayname) {
+        this.displayname = displayname;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Board.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Board.java
deleted file mode 100644
index 0436b1e18..000000000
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Board.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package it.niedermann.nextcloud.deck.model.board;
-
-import it.niedermann.nextcloud.deck.model.DBStatus;
-import it.niedermann.nextcloud.deck.model.RemoteEntity;
-
-public class Board extends RemoteEntity {
-    private long accountId;
-    private String title;
-    private DBStatus status = DBStatus.UP_TO_DATE;
-
-    public Board(long accountId, long remoteId, String title) {
-        super(remoteId);
-        this.accountId = accountId;
-        this.title = title;
-    }
-
-    public Board(long accountId, long id, String title, DBStatus status) {
-        super();
-        this.accountId = accountId;
-        this.id = id;
-        this.title = title;
-        this.status = status;
-    }
-
-    public long getRemoteId() {
-        return remoteId;
-    }
-
-    public void setRemoteId(long remoteId) {
-        this.remoteId = remoteId;
-    }
-
-    public long getAccountId() {
-        return accountId;
-    }
-
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public DBStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(DBStatus status) {
-        this.status = status;
-    }
-}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Card.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Card.java
deleted file mode 100644
index 2cffedac3..000000000
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Card.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package it.niedermann.nextcloud.deck.model.board;
-
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
-
-import it.niedermann.nextcloud.deck.model.RemoteEntity;
-
-public class Card extends RemoteEntity {
-
-    private String title;
-    private String description;
-    private long stackId;
-    private String type;
-    private LocalDate lastModified;
-    private LocalDate createdAt;
-    private LocalDate deletedAt;
-    private List<Label> labels = new ArrayList<>();
-    private List<User> assignedUsers;
-    private String attachments;
-    private int attachmentCount;
-    private String owner;
-    private String order;
-    private boolean archived;
-    private String dueDate;
-    private int overdue;
-    private int commentsUnread;
-
-    public Card(long remoteId, String title) {
-        super(remoteId);
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public long getStackId() {
-        return stackId;
-    }
-
-    public void setStackId(long stackId) {
-        this.stackId = stackId;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public LocalDate getLastModified() {
-        return lastModified;
-    }
-
-    public void setLastModified(LocalDate lastModified) {
-        this.lastModified = lastModified;
-    }
-
-    public LocalDate getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(LocalDate createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public LocalDate getDeletedAt() {
-        return deletedAt;
-    }
-
-    public void setDeletedAt(LocalDate deletedAt) {
-        this.deletedAt = deletedAt;
-    }
-
-    public List<Label> getLabels() {
-        return labels;
-    }
-
-    public void setLabels(List<Label> labels) {
-        this.labels = labels;
-    }
-
-    public void addLabel(Label label){
-        this.labels.add(label);
-    }
-
-    public List<User> getAssignedUsers() {
-        return assignedUsers;
-    }
-
-    public void setAssignedUsers(List<User> assignedUsers) {
-        this.assignedUsers = assignedUsers;
-    }
-
-    public void addAssignedUser(User user) {
-        this.assignedUsers.add(user);
-    }
-
-    public String getAttachments() {
-        return attachments;
-    }
-
-    public void setAttachments(String attachments) {
-        this.attachments = attachments;
-    }
-
-    public int getAttachmentCount() {
-        return attachmentCount;
-    }
-
-    public void setAttachmentCount(int attachmentCount) {
-        this.attachmentCount = attachmentCount;
-    }
-
-    public String getOwner() {
-        return owner;
-    }
-
-    public void setOwner(String owner) {
-        this.owner = owner;
-    }
-
-    public String getOrder() {
-        return order;
-    }
-
-    public void setOrder(String order) {
-        this.order = order;
-    }
-
-    public boolean isArchived() {
-        return archived;
-    }
-
-    public void setArchived(boolean archived) {
-        this.archived = archived;
-    }
-
-    public String getDueDate() {
-        return dueDate;
-    }
-
-    public void setDueDate(String dueDate) {
-        this.dueDate = dueDate;
-    }
-
-    public int getOverdue() {
-        return overdue;
-    }
-
-    public void setOverdue(int overdue) {
-        this.overdue = overdue;
-    }
-
-    public int getCommentsUnread() {
-        return commentsUnread;
-    }
-
-    public void setCommentsUnread(int commentsUnread) {
-        this.commentsUnread = commentsUnread;
-    }
-}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Label.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Label.java
deleted file mode 100644
index 4fee803f3..000000000
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Label.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package it.niedermann.nextcloud.deck.model.board;
-
-import it.niedermann.nextcloud.deck.model.RemoteEntity;
-
-public class Label extends RemoteEntity {
-    private String title;
-    private String color;
-    private long boardId;
-    private long cardId;
-
-    public Label() {
-        super();
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public long getBoardId() {
-        return boardId;
-    }
-
-    public void setBoardId(long boardId) {
-        this.boardId = boardId;
-    }
-
-    public long getCardId() {
-        return cardId;
-    }
-
-    public void setCardId(long cardId) {
-        this.cardId = cardId;
-    }
-}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Stack.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Stack.java
deleted file mode 100644
index 40b934098..000000000
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Stack.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package it.niedermann.nextcloud.deck.model.board;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-
-import it.niedermann.nextcloud.deck.model.DBStatus;
-import it.niedermann.nextcloud.deck.model.RemoteEntity;
-
-public class Stack extends RemoteEntity {
-    private String title;
-    private long boardId;
-    private LocalDate deletedAt;
-    private int order;
-    private DBStatus status = DBStatus.UP_TO_DATE;
-
-    public Stack() {
-        super();
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public long getBoardId() {
-        return boardId;
-    }
-
-    public void setBoardId(long boardId) {
-        this.boardId = boardId;
-    }
-
-    public LocalDate getDeletedAt() {
-        return deletedAt;
-    }
-
-    public void setDeletedAt(LocalDate deletedAt) {
-        this.deletedAt = deletedAt;
-    }
-
-    public int getOrder() {
-        return order;
-    }
-
-    public void setOrder(int order) {
-        this.order = order;
-    }
-
-    public DBStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(DBStatus status) {
-        this.status = status;
-    }
-}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/User.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/User.java
deleted file mode 100644
index 34c4210ad..000000000
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/User.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package it.niedermann.nextcloud.deck.model.board;
-
-import java.io.Serializable;
-
-import it.niedermann.nextcloud.deck.model.RemoteEntity;
-
-public class User implements Serializable {
-
-    private String primaryKey;
-    private String uid;
-    private String displayname;
-
-    public User() {
-        super();
-    }
-
-    public User(String primaryKey, String uid, String displayname) {
-        this.primaryKey = primaryKey;
-        this.uid = uid;
-        this.displayname = displayname;
-    }
-
-    public String getPrimaryKey() {
-        return primaryKey;
-    }
-
-    public void setPrimaryKey(String primaryKey) {
-        this.primaryKey = primaryKey;
-    }
-
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
-    public String getDisplayname() {
-        return displayname;
-    }
-
-    public void setDisplayname(String displayname) {
-        this.displayname = displayname;
-    }
-}
-- 
cgit v1.2.3