From 7b6831501be184f4a86840c4e98a9ebc82dc2069 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Fri, 24 Feb 2012 16:56:21 -0800 Subject: [PATCH] This commit was overruled by committee. Revert "For simplicity and performance, kill the 'tags that start with _' tasks being hidden from the inbox" This reverts commit 514a83df60bee97bb21b84f9df58561b1376707a. --- .../com/todoroo/astrid/core/CoreFilterExposer.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java index a29f1916f..d08e1b6f2 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java @@ -12,13 +12,18 @@ import android.graphics.drawable.BitmapDrawable; import com.timsu.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Criterion; +import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridFilterExposer; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterListItem; +import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; +import com.todoroo.astrid.data.Metadata; +import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskApiDao.TaskCriteria; +import com.todoroo.astrid.tags.TagService; /** * Exposes Astrid's built in filters to the {@link FilterListFragment} @@ -56,7 +61,10 @@ public final class CoreFilterExposer extends BroadcastReceiver implements Astrid public static Filter buildInboxFilter(Resources r) { Filter inbox = new Filter(r.getString(R.string.BFE_Active), r.getString(R.string.BFE_Active), new QueryTemplate().where( - Criterion.and(TaskCriteria.activeVisibleMine())), + Criterion.and(TaskCriteria.activeVisibleMine(), + Criterion.not(Task.ID.in(Query.select(Metadata.TASK).from(Metadata.TABLE).where( + Criterion.and(MetadataCriteria.withKey(TagService.KEY), + TagService.TAG.like("x_%", "x"))))))), //$NON-NLS-1$ //$NON-NLS-2$ null); inbox.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_inbox)).getBitmap(); return inbox;