downsync: remove remote deleted stacks

2 files changed, 9 insertions, 1 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 a4d079fe7..4996f29e1 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
@@ -286,10 +286,14 @@ public class DataBaseAdapter {
         db.getBoardDao().update(board);
     }
 
-    public LiveData<List<FullStack>> getStacks(long accountId, long localBoardId) {
+    public LiveData<List<FullStack>> getFullStacksForBoard(long accountId, long localBoardId) {
         return LiveDataHelper.onlyIfChanged(db.getStackDao().getFullStacksForBoard(accountId, localBoardId));
     }
 
+    public List<FullStack> getFullStacksForBoardDirectly(long accountId, long localBoardId) {
+        return db.getStackDao().getFullStacksForBoardDirectly(accountId, localBoardId);
+    }
+
     public LiveData<FullStack> getStack(long accountId, long localStackId) {
         return LiveDataHelper.onlyIfChanged(db.getStackDao().getFullStack(accountId, localStackId));
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java
index 534773f0f..553a67d95 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java
@@ -49,4 +49,8 @@ public interface StackDao extends GenericDao<Stack> {
     @Transaction
     @Query("SELECT * FROM stack WHERE accountId = :accountId and (status<>1 or id is null or lastModified <> lastModifiedLocal)")
     List<FullStack> getLocallyChangedStacksDirectly(long accountId);
+
+    @Transaction
+    @Query("SELECT * FROM stack WHERE accountId = :accountId AND boardId = :localBoardId and status<>3 and (deletedAt is null or deletedAt = 0) order by `order` asc")
+    List<FullStack> getFullStacksForBoardDirectly(long accountId, long localBoardId);
 }
\ No newline at end of file