Add menu to CustomFilter

app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java

@@ -43,7 +43,6 @@ import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.astrid.adapter.TaskAdapter;
 import com.todoroo.astrid.adapter.TaskAdapterProvider;
 import com.todoroo.astrid.api.CaldavFilter;
-import com.todoroo.astrid.api.CustomFilter;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.GtasksFilter;
 import com.todoroo.astrid.api.SearchFilter;
@@ -295,12 +294,8 @@ public final class TaskListFragment extends InjectingFragment
 
   private void setupMenu(Toolbar toolbar) {
     toolbar.inflateMenu(R.menu.menu_task_list_fragment);
-    if (filter instanceof CustomFilter && ((CustomFilter) filter).getId() > 0) {
+    if (filter.hasMenu()) {
-      toolbar.inflateMenu(R.menu.menu_custom_filter);
+      toolbar.inflateMenu(filter.getMenu());
-    }
-    int menuRes = filter.getMenu();
-    if (menuRes > 0) {
-      toolbar.inflateMenu(menuRes);
     }
     Menu menu = toolbar.getMenu();
     MenuItem hidden = menu.findItem(R.id.menu_show_hidden);

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

@@ -5,6 +5,7 @@ import static com.todoroo.andlib.utility.AndroidUtilities.mapToSerializedString;
 import android.os.Parcel;
 import android.os.Parcelable;
 import java.util.Map;
+import org.tasks.R;
 
 public class CustomFilter extends Filter {
 
@@ -69,4 +70,9 @@ public class CustomFilter extends Filter {
     id = source.readLong();
     criterion = source.readString();
   }
+
+  @Override
+  public int getMenu() {
+    return getId() > 0 ? R.menu.menu_custom_filter : 0;
+  }
 }

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

@@ -186,6 +186,10 @@ public class Filter extends FilterListItem {
     return false;
   }
 
+  public boolean hasMenu() {
+    return getMenu() != 0;
+  }
+
   public @MenuRes int getMenu() {
     return 0;
   }