Fix check for filter criteria changes

app/src/main/java/com/todoroo/astrid/api/CustomFilter.java

@@ -1,7 +1,5 @@
 package com.todoroo.astrid.api;
 
-import static com.todoroo.andlib.utility.AndroidUtilities.mapToSerializedString;
-
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
@@ -32,30 +30,16 @@ public class CustomFilter extends Filter {
 
   public CustomFilter(org.tasks.data.Filter filter) {
     super(filter.getTitle(), filter.getSql(), filter.getValuesAsMap());
-    this.id = filter.getId();
+    id = filter.getId();
-    this.criterion = filter.getCriterion();
+    criterion = filter.getCriterion();
-    this.tint = filter.getColor();
+    tint = filter.getColor();
-    this.icon = filter.getIcon();
+    icon = filter.getIcon();
   }
 
   private CustomFilter(Parcel parcel) {
     readFromParcel(parcel);
   }
 
-  public org.tasks.data.Filter toStoreObject() {
-    org.tasks.data.Filter filter = new org.tasks.data.Filter();
-    filter.setId(id);
-    filter.setTitle(listingTitle);
-    filter.setSql(sqlQuery);
-    filter.setIcon(icon);
-    filter.setColor(tint);
-    if (valuesForNewTasks != null && valuesForNewTasks.size() > 0) {
-      filter.setValues(mapToSerializedString(valuesForNewTasks));
-    }
-    filter.setCriterion(criterion);
-    return filter;
-  }
-
   public void setId(long id) {
     this.id = id;
   }

app/src/main/java/org/tasks/activities/FilterSettingsActivity.java

@@ -8,7 +8,9 @@ package org.tasks.activities;
 
 import static android.text.TextUtils.isEmpty;
 import static com.google.common.collect.Iterables.find;
+import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Lists.transform;
+import static com.todoroo.andlib.utility.AndroidUtilities.mapToSerializedString;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -30,6 +32,7 @@ import com.google.android.material.floatingactionbutton.ExtendedFloatingActionBu
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.common.base.Joiner;
+import com.google.common.base.Strings;
 import com.todoroo.andlib.data.Property.CountProperty;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.sql.UnaryCriterion;
@@ -47,7 +50,6 @@ import com.todoroo.astrid.core.CustomFilterItemTouchHelper;
 import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.data.Task;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -88,11 +90,6 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     filter = getIntent().getParcelableExtra(TOKEN_FILTER);
-    if (filter == null) {
-      org.tasks.data.Filter f = new org.tasks.data.Filter();
-      f.setSql("");
-      this.filter = new CustomFilter(f);
-    }
 
     super.onCreate(savedInstanceState);
 
@@ -102,23 +99,24 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
       name.setText(filter.listingTitle);
     }
 
+    if (savedInstanceState != null) {
       criteria =
-        new ArrayList<>(
           CriterionInstance.fromString(
-                filterCriteriaProvider,
+              filterCriteriaProvider, savedInstanceState.getString(EXTRA_CRITERIA));
-                savedInstanceState == null
+    } else if (filter != null) {
-                    ? filter.getCriterion()
+      criteria = CriterionInstance.fromString(filterCriteriaProvider, filter.getCriterion());
-                    : savedInstanceState.getString(EXTRA_CRITERIA)));
+    } else {
-    if (criteria.isEmpty()) {
       CriterionInstance instance = new CriterionInstance();
       instance.criterion = filterCriteriaProvider.getStartingUniverse();
       instance.type = CriterionInstance.TYPE_UNIVERSE;
-      criteria.add(instance);
+      criteria = newArrayList(instance);
     }
+
     adapter = new CustomFilterAdapter(criteria, locale, this::onClick);
     recyclerView.setLayoutManager(new LinearLayoutManager(this));
     recyclerView.setAdapter(adapter);
-    new ItemTouchHelper(new CustomFilterItemTouchHelper(this, this::onMove, this::onDelete, this::updateList))
+    new ItemTouchHelper(
+            new CustomFilterItemTouchHelper(this, this::onMove, this::onDelete, this::updateList))
         .attachToRecyclerView(recyclerView);
 
     fab.setExtended(isNew() || adapter.getItemCount() <= 1);
@@ -256,7 +254,7 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
 
   @Override
   protected boolean isNew() {
-    return filter.getId() == 0;
+    return filter == null;
   }
 
   @Override
@@ -284,19 +282,23 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
     }
 
     if (hasChanges()) {
-      filter.listingTitle = newName;
+      org.tasks.data.Filter f = new org.tasks.data.Filter();
-      filter.tint = selectedColor;
+      f.setTitle(newName);
-      filter.icon = selectedIcon;
+      f.setColor(selectedColor);
-      filter.sqlQuery = getSql();
+      f.setIcon(selectedIcon);
-      filter.valuesForNewTasks.clear();
+      f.setValues(mapToSerializedString(getValues()));
-      for (Map.Entry<String, Object> entry : getValues().entrySet()) {
+      f.setCriterion(getCriterion());
-        filter.valuesForNewTasks.put(entry.getKey(), entry.getValue());
+      f.setSql(getSql());
-      }
+      if (isNew()) {
-      filter.setCriterion(getCriterion());
+        f.setId(filterDao.insert(f));
-      filter.setId(filterDao.insertOrUpdate(filter.toStoreObject()));
+      } else {
+        f.setId(filter.getId());
+        filterDao.update(f);
+      }
       setResult(
           RESULT_OK,
-          new Intent(TaskListFragment.ACTION_RELOAD).putExtra(MainActivity.OPEN_FILTER, filter));
+          new Intent(TaskListFragment.ACTION_RELOAD)
+              .putExtra(MainActivity.OPEN_FILTER, new CustomFilter(f)));
     }
 
     finish();
@@ -308,12 +310,18 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
 
   @Override
   protected boolean hasChanges() {
-    return !(getNewName().equals(filter.listingTitle)
+    if (isNew()) {
-        && selectedColor == filter.tint
+      return !Strings.isNullOrEmpty(getNewName())
-        && selectedIcon == filter.icon
+          || selectedColor != 0
-        && getSql().equals(filter.sqlQuery)
+          || selectedIcon != -1
-        && getValues().equals(filter.valuesForNewTasks)
+          || criteria.size() > 1;
-        && getCriterion().equals(filter.getCriterion()));
+    }
+    return !getNewName().equals(filter.listingTitle)
+        || selectedColor != filter.tint
+        || selectedIcon != filter.icon
+        || !getCriterion().equals(filter.getCriterion())
+        || !getValues().equals(filter.valuesForNewTasks)
+        || !getSql().equals(filter.getOriginalSqlQuery());
   }
 
   @Override

app/src/main/java/org/tasks/data/FilterDao.java

@@ -19,11 +19,8 @@ public interface FilterDao {
   @Query("SELECT * FROM filters WHERE title = :title COLLATE NOCASE LIMIT 1")
   Filter getByName(String title);
 
-  @Insert(onConflict = OnConflictStrategy.REPLACE)
-  long insertOrUpdate(Filter storeObject);
-
   @Insert
-  void insert(Filter filter);
+  long insert(Filter filter);
 
   @Query("SELECT * FROM filters")
   List<Filter> getFilters();