From 281589be0624321bc528c1ef211d22340153e1aa Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 23 Apr 2020 07:46:09 -0500
Subject: [PATCH] Remove icon from custom filter criterion

---
 .../com/todoroo/astrid/api/CustomFilterCriterion.java     | 5 -----
 .../com/todoroo/astrid/api/MultipleSelectCriterion.java   | 5 -----
 .../java/com/todoroo/astrid/api/TextInputCriterion.java   | 5 -----
 .../java/org/tasks/filters/FilterCriteriaProvider.java    | 8 --------
 4 files changed, 23 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java b/app/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java
index def7ec3cb..833b0ab7a 100644
--- a/app/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java
+++ b/app/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java
@@ -6,7 +6,6 @@
 
 package com.todoroo.astrid.api;
 
-import android.graphics.Bitmap;
 import android.os.Parcel;
 import android.os.Parcelable;
 import java.util.HashMap;
@@ -52,8 +51,6 @@ public abstract class CustomFilterCriterion implements Parcelable {
   public String sql;
   /** Criteria name. This is displayed when users are selecting a criteria */
   public String name;
-  /** Icon for this criteria. Can be null for no bitmap */
-  Bitmap icon;
 
   // --- parcelable utilities
 
@@ -68,7 +65,6 @@ public abstract class CustomFilterCriterion implements Parcelable {
     dest.writeString(text);
     dest.writeString(sql);
     dest.writeMap(valuesForNewTasks);
-    dest.writeParcelable(icon, 0);
     dest.writeString(name);
   }
 
@@ -78,7 +74,6 @@ public abstract class CustomFilterCriterion implements Parcelable {
     text = source.readString();
     sql = source.readString();
     source.readMap(valuesForNewTasks, getClass().getClassLoader());
-    icon = source.readParcelable(Bitmap.class.getClassLoader());
     name = source.readString();
   }
 }
diff --git a/app/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java b/app/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java
index 2cf4b07ef..5924d8bfc 100644
--- a/app/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java
+++ b/app/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java
@@ -6,7 +6,6 @@
 
 package com.todoroo.astrid.api;
 
-import android.graphics.Bitmap;
 import android.os.Parcel;
 import android.os.Parcelable;
 import java.util.Arrays;
@@ -52,7 +51,6 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
       Map<String, Object> valuesForNewTasks,
       String[] entryTitles,
       String[] entryValues,
-      Bitmap icon,
       String name) {
     this.identifier = identifier;
     this.text = title;
@@ -62,7 +60,6 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
     }
     this.entryTitles = entryTitles;
     this.entryValues = entryValues;
-    this.icon = icon;
     this.name = name;
   }
 
@@ -107,8 +104,6 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
         + ", name='"
         + name
         + '\''
-        + ", icon="
-        + icon
         + '}';
   }
 }
diff --git a/app/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java b/app/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java
index 9469f5788..14bf4f836 100644
--- a/app/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java
+++ b/app/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java
@@ -6,7 +6,6 @@
 
 package com.todoroo.astrid.api;
 
-import android.graphics.Bitmap;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -49,14 +48,12 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
       String sql,
       String prompt,
       String hint,
-      Bitmap icon,
       String name) {
     this.identifier = identifier;
     this.text = title;
     this.sql = sql;
     this.prompt = prompt;
     this.hint = hint;
-    this.icon = icon;
     this.name = name;
   }
 
@@ -103,8 +100,6 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
         + ", name='"
         + name
         + '\''
-        + ", icon="
-        + icon
         + '}';
   }
 }
diff --git a/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java b/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java
index 2bc8478a2..3bb186079 100644
--- a/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java
+++ b/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java
@@ -95,7 +95,6 @@ public class FilterCriteriaProvider {
         null,
         null,
         null,
-        null,
         null);
   }
 
@@ -135,7 +134,6 @@ public class FilterCriteriaProvider {
         values,
         tagNames,
         tagNames,
-        null,
         context.getString(R.string.CFC_tag_name));
   }
 
@@ -152,7 +150,6 @@ public class FilterCriteriaProvider {
             .toString(),
         context.getString(R.string.CFC_tag_contains_name),
         "",
-        null,
         context.getString(R.string.CFC_tag_contains_name));
   }
 
@@ -183,7 +180,6 @@ public class FilterCriteriaProvider {
         values,
         r.getStringArray(R.array.CFC_dueBefore_entries),
         entryValues,
-        null,
         r.getString(R.string.CFC_dueBefore_name));
   }
 
@@ -208,7 +204,6 @@ public class FilterCriteriaProvider {
         values,
         entries,
         entryValues,
-        null,
         r.getString(R.string.CFC_importance_name));
   }
 
@@ -222,7 +217,6 @@ public class FilterCriteriaProvider {
             .toString(),
         r.getString(R.string.CFC_title_contains_name),
         "",
-        null,
         r.getString(R.string.CFC_title_contains_name));
   }
 
@@ -252,7 +246,6 @@ public class FilterCriteriaProvider {
         values,
         listNames,
         listIds,
-        null,
         context.getString(R.string.CFC_gtasks_list_name));
   }
 
@@ -281,7 +274,6 @@ public class FilterCriteriaProvider {
         values,
         names,
         ids,
-        null,
         context.getString(R.string.CFC_caldav_list_name));
   }
 }