#767 filter widget rewrite: remove old entity from room

2 files changed, 13 insertions, 18 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 2d1900ad8..c318e601d 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
@@ -70,7 +70,6 @@ import it.niedermann.nextcloud.deck.model.widget.singlecard.SingleCardWidgetMode
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.WrappedLiveData;
 import it.niedermann.nextcloud.deck.ui.widget.singlecard.SingleCardWidget;
-import it.niedermann.nextcloud.deck.ui.widget.stack.StackWidget;
 
 import static androidx.lifecycle.Transformations.distinctUntilChanged;
 
@@ -636,10 +635,10 @@ public class DataBaseAdapter {
         markAsEditedIfNeeded(stack, setStatus);
         db.getStackDao().update(stack);
         notifyFilterWidgetsAboutChangedEntity(FilterWidget.EChangedEntityType.STACK, stack.getLocalId());
-        if (db.getStackWidgetModelDao().containsStackLocalId(stack.getLocalId())) {
-            DeckLog.info("Notifying " + StackWidget.class.getSimpleName() + " about card changes for \"" + stack.getTitle() + "\"");
-            // FIXME StackWidget.notifyDatasetChanged(context);
-        }
+//        if (db.getStackWidgetModelDao().containsStackLocalId(stack.getLocalId())) {
+//            DeckLog.info("Notifying " + StackWidget.class.getSimpleName() + " about card changes for \"" + stack.getTitle() + "\"");
+//            // FIXME StackWidget.notifyDatasetChanged(context);
+//        }
     }
 
     @WorkerThread
@@ -720,10 +719,10 @@ public class DataBaseAdapter {
     }
 
     private void notifyStackWidgetsIfNeeded(String cardTitle, long... affectedStackIds) {
-        if (db.getStackWidgetModelDao().containsStackLocalId(affectedStackIds)) {
-            DeckLog.info("Notifying " + StackWidget.class.getSimpleName() + " about card changes for \"" + cardTitle + "\"");
-            // FIXME StackWidget.notifyDatasetChanged(context);
-        }
+//        if (db.getStackWidgetModelDao().containsStackLocalId(affectedStackIds)) {
+//            DeckLog.info("Notifying " + StackWidget.class.getSimpleName() + " about card changes for \"" + cardTitle + "\"");
+//            // FIXME StackWidget.notifyDatasetChanged(context);
+//        }
     }
 
     @WorkerThread
@@ -1158,11 +1157,12 @@ public class DataBaseAdapter {
         model.setStackId(stackId);
         model.setDarkTheme(darkTheme);
 
-        db.getStackWidgetModelDao().insert(model);
+//        db.getStackWidgetModelDao().insert(model);
     }
 
     public StackWidgetModel getStackWidgetModelDirectly(int appWidgetId) {
-        return db.getStackWidgetModelDao().getStackWidgetByAppWidgetIdDirectly(appWidgetId);
+//        return db.getStackWidgetModelDao().getStackWidgetByAppWidgetIdDirectly(appWidgetId);
+        return null;
     }
 
     public int createFilterWidgetDirectly(@NonNull FilterWidget filterWidget) {
@@ -1367,7 +1367,7 @@ public class DataBaseAdapter {
     public void deleteStackWidget(int appWidgetId) {
         StackWidgetModel model = new StackWidgetModel();
         model.setAppWidgetId(appWidgetId);
-        db.getStackWidgetModelDao().delete(model);
+//        db.getStackWidgetModelDao().delete(model);
     }
 
     public LiveData<List<Account>> readAccountsForHostWithReadAccessToBoard(String host, long boardRemoteId) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java
index 43870b57e..a09a0eaaf 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java
@@ -35,7 +35,6 @@ import it.niedermann.nextcloud.deck.model.Label;
 import it.niedermann.nextcloud.deck.model.Permission;
 import it.niedermann.nextcloud.deck.model.Stack;
 import it.niedermann.nextcloud.deck.model.User;
-import it.niedermann.nextcloud.deck.model.appwidgets.StackWidgetModel;
 import it.niedermann.nextcloud.deck.model.enums.DBStatus;
 import it.niedermann.nextcloud.deck.model.ocs.Activity;
 import it.niedermann.nextcloud.deck.model.ocs.comment.DeckComment;
@@ -81,7 +80,6 @@ import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao.projects.Jo
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao.projects.OcsProjectDao;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao.projects.OcsProjectResourceDao;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao.widgets.SingleCardWidgetModelDao;
-import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao.widgets.StackWidgetModelDao;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao.widgets.filter.FilterWidgetAccountDao;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao.widgets.filter.FilterWidgetBoardDao;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao.widgets.filter.FilterWidgetDao;
@@ -111,7 +109,6 @@ import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao.widgets.fil
                 DeckComment.class,
                 Mention.class,
                 SingleCardWidgetModel.class,
-                StackWidgetModel.class,
                 OcsProject.class,
                 OcsProjectResource.class,
                 JoinCardWithProject.class,
@@ -498,7 +495,7 @@ public abstract class DeckDatabase extends RoomDatabase {
                 values = new ContentValues();
                 values.put("filterBoardId", filterWidgetBoardId);
                 values.put("stackId", localStackId);
-                database.insert("FilterWidgetBoard", SQLiteDatabase.CONFLICT_NONE, values);
+                database.insert("FilterWidgetStack", SQLiteDatabase.CONFLICT_NONE, values);
 
 
             }
@@ -628,8 +625,6 @@ public abstract class DeckDatabase extends RoomDatabase {
 
     public abstract SingleCardWidgetModelDao getSingleCardWidgetModelDao();
 
-    public abstract StackWidgetModelDao getStackWidgetModelDao();
-
     public abstract OcsProjectDao getOcsProjectDao();
 
     public abstract OcsProjectResourceDao getOcsProjectResourceDao();