From 4fc5c7714fb1b48ae46dcacbda287bcef9c3f6bf Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 26 Apr 2013 10:55:11 -0700 Subject: [PATCH] Custom filter criteria should respect metadata deletion date --- .../todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java index 7dcc3ef1e..c9e182e50 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java @@ -55,7 +55,7 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver { Task.TABLE, Metadata.TASK.eq(Task.ID))).where(Criterion.and( TaskDao.TaskCriteria.activeAndVisible(), MetadataDao.MetadataCriteria.withKey(TaskToTagMetadata.KEY), - TaskToTagMetadata.TAG_NAME.eq("?"))).toString(), + TaskToTagMetadata.TAG_NAME.eq("?"), Metadata.DELETION_DATE.eq(0))).toString(), values, tagNames, tagNames, ((BitmapDrawable)r.getDrawable(TagService.getDefaultImageIDForTag(RemoteModel.NO_UUID))).getBitmap(), context.getString(R.string.CFC_tag_name)); @@ -71,7 +71,7 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver { Task.TABLE, Metadata.TASK.eq(Task.ID))).where(Criterion.and( TaskDao.TaskCriteria.activeAndVisible(), MetadataDao.MetadataCriteria.withKey(TaskToTagMetadata.KEY), - TaskToTagMetadata.TAG_NAME.like("%?%"))).toString(), + TaskToTagMetadata.TAG_NAME.like("%?%"), Metadata.DELETION_DATE.eq(0))).toString(), null, context.getString(R.string.CFC_tag_contains_name), "", ((BitmapDrawable)r.getDrawable(TagService.getDefaultImageIDForTag(RemoteModel.NO_UUID))).getBitmap(), context.getString(R.string.CFC_tag_contains_name));