Make basics for managing archived boards

2 files changed, 18 insertions, 6 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
index 0d95c1f8e..77be75bbf 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
@@ -380,8 +380,11 @@ public class DataBaseAdapter {
         return distinctUntilChanged(db.getAccountDao().getAllAccounts());
     }
 
-    public LiveData<List<Board>> getBoards(long accountId) {
-        return distinctUntilChanged(db.getBoardDao().getBoardsForAccount(accountId));
+    public LiveData<List<Board>> getBoards(long accountId, boolean archived) {
+        return distinctUntilChanged(
+                archived
+                        ? db.getBoardDao().getArchivedBoardsForAccount(accountId)
+                        : db.getBoardDao().getNonArchivedBoardsForAccount(accountId));
     }
 
     public LiveData<List<Board>> getBoardsWithEditPermission(long accountId) {
@@ -800,7 +803,9 @@ public class DataBaseAdapter {
         return db.getLabelDao().getLabelByBoardIdAndTitleDirectly(boardId, title);
     }
 
-    public LiveData<List<FullBoard>> getFullBoards(long accountId) {
-        return db.getBoardDao().getFullBoards(accountId);
+    public LiveData<List<FullBoard>> getFullBoards(long accountId, boolean archived) {
+        return archived
+                ? db.getBoardDao().getArchivedFullBoards(accountId)
+                : db.getBoardDao().getNonArchivedFullBoards(accountId);
     }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java
index 778c212ba..ad01fd0b0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java
@@ -13,12 +13,19 @@ import it.niedermann.nextcloud.deck.model.full.FullBoard;
 @Dao
 public interface BoardDao extends GenericDao<Board> {
 
+    @Query("SELECT * FROM board WHERE accountId = :accountId and archived = 1 and (deletedAt = 0 or deletedAt is null) and status <> 3 order by title asc")
+    LiveData<List<Board>> getArchivedBoardsForAccount(final long accountId);
+
     @Query("SELECT * FROM board WHERE accountId = :accountId and archived = 0 and (deletedAt = 0 or deletedAt is null) and status <> 3 order by title asc")
-    LiveData<List<Board>> getBoardsForAccount(final long accountId);
+    LiveData<List<Board>> getNonArchivedBoardsForAccount(final long accountId);
+
+    @Transaction
+    @Query("SELECT * FROM board WHERE accountId = :accountId and archived = 1 and (deletedAt = 0 or deletedAt is null) and status <> 3 order by title asc")
+    LiveData<List<FullBoard>> getArchivedFullBoards(long accountId);
 
     @Transaction
     @Query("SELECT * FROM board WHERE accountId = :accountId and archived = 0 and (deletedAt = 0 or deletedAt is null) and status <> 3 order by title asc")
-    LiveData<List<FullBoard>> getFullBoards(long accountId);
+    LiveData<List<FullBoard>> getNonArchivedFullBoards(long accountId);
 
     @Query("SELECT * FROM board WHERE accountId = :accountId and id = :remoteId")
     LiveData<Board> getBoardByRemoteId(final long accountId, final long remoteId);