Exclude deleted tasks from search results

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

@@ -257,20 +257,11 @@ public class TaskListFragment extends InjectingFragment implements
                 query = query.trim();
                 String title = getString(R.string.FLA_search_filter, query);
                 Filter savedFilter = new Filter(title,
-                        new QueryTemplate().where
+                        new QueryTemplate().where(Criterion.and(
-                                (Criterion.or(Task.NOTES.
+                                        Task.DELETION_DATE.eq(0),
-                                                        like(
+                                        Criterion.or(
-                                                                "%" + //$NON-NLS-1$
+                                                Task.NOTES.like("%" + query + "%"),
-                                                                        query + "%"
+                                                Task.TITLE.like("%" + query + "%")))));
-                                                        ),
-                                                Task.TITLE.
-                                                        like(
-                                                                "%" + //$NON-NLS-1$
-                                                                        query + "%"
-                                                        )
-                                        )
-                                ));
-
                 ((TaskListActivity) getActivity()).onFilterItemClicked(savedFilter);
                 MenuItemCompat.collapseActionView(item);
                 return true;