upsync WIP

2 files changed, 13 insertions, 3 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 ddb8866cd..d64b17d86 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
@@ -217,6 +217,9 @@ public class DataBaseAdapter {
         markAsDeletedIfNeeded(label, setStatus);
         db.getLabelDao().update(label);
     }
+    public void deleteLabelPhysically(Label label) {
+        db.getLabelDao().delete(label);
+    }
 
     public WrappedLiveData<Account> createAccount(Account account) {
         return LiveDataHelper.wrapInLiveData(() -> {
@@ -305,12 +308,15 @@ public class DataBaseAdapter {
         db.getStackDao().update(stack);
     }
     
+    public Card  getCardByLocalIdDirectly(long accountId, long localCardId) {
+        return db.getCardDao().getCardByLocalIdDirectly(accountId, localCardId);
+    }
+
     public LiveData<FullCard>  getCardByLocalId(long accountId, long localCardId) {
         return LiveDataHelper.interceptLiveData(db.getCardDao().getFullCardByLocalId(accountId, localCardId), this::readRelationsForCard);
     }
-
-    public Card  getCardByLocalIdDirectly(long accountId, long localCardId) {
-        return db.getCardDao().getCardByLocalIdDirectly(accountId, localCardId);
+    public List<FullCard> getLocallyChangedCardsDirectly(long accountId) {
+        return db.getCardDao().getLocallyChangedCardsDirectly(accountId);
     }
 
     public long createCard(long accountId, Card card) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java
index 6c0c7dcf3..de18cf398 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java
@@ -48,4 +48,8 @@ public interface CardDao extends GenericDao<Card> {
 
     @Query("SELECT * FROM card WHERE accountId = :accountId and id = :remoteId")
     Card getCardByRemoteIdDirectly(long accountId, long remoteId);
+
+    @Transaction
+    @Query("SELECT * FROM card WHERE accountId = :accountId and (status<>1 or id is null or lastModified <> lastModifiedLocal)")
+    List<FullCard> getLocallyChangedCardsDirectly(long accountId);
 }
\ No newline at end of file