From e337f5bb23bec20d064da5dd959246c7ac6bc8ae Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 29 Nov 2011 15:03:30 -0800 Subject: [PATCH] Fixed a bug where filtering my own tasks with picture would show empty list --- .../com/todoroo/astrid/actfm/TagViewActivity.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java index 799bd4653..f7a5e8ea3 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java @@ -386,8 +386,14 @@ public class TagViewActivity extends TaskListActivity { } else { // New filter currentId = id; - Criterion assigned = Criterion.and(TaskCriteria.activeAndVisible(), Task.USER_ID.eq(id)); + Criterion assignedCriterion; + if (currentId == ActFmPreferenceService.userId()) + assignedCriterion = Criterion.or(Task.USER_ID.eq(0), Task.USER_ID.eq(id)); + else + assignedCriterion = Task.USER_ID.eq(id); + Criterion assigned = Criterion.and(TaskCriteria.activeAndVisible(), assignedCriterion); filter = TagFilterExposer.filterFromTag(TagViewActivity.this, new Tag(tagData), assigned); + System.err.println("Filter: " + filter.sqlQuery); TextView filterByAssigned = (TextView) findViewById(R.id.filter_assigned); filterByAssigned.setVisibility(View.VISIBLE); filterByAssigned.setText(getString(R.string.actfm_TVA_filtered_by_assign, displayName));