From a8a09ef7a5f49fe9bc9006e82b92fc43a1afef28 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 11 May 2012 12:45:33 -0700 Subject: [PATCH] Fixed a progaurd issue that was breaking things, fixed a bug in the my shared tasks filter --- .../com/todoroo/astrid/people/PeopleFilterExposer.java | 4 +++- astrid/proguard.cfg | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java index 1fa022a50..4aa0093b0 100644 --- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java @@ -28,6 +28,7 @@ import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.api.FilterWithCustomIntent; import com.todoroo.astrid.api.FilterWithUpdate; import com.todoroo.astrid.core.PluginServices; +import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Task; @@ -130,7 +131,8 @@ public class PeopleFilterExposer extends BroadcastReceiver { QueryTemplate template = new QueryTemplate().join(Join.inner(Metadata.TABLE.as("mtags"), Criterion.and(Task.ID.eq(Field.field("mtags." + Metadata.TASK.name)), Field.field("mtags." + Metadata.KEY.name).eq(TagService.KEY), - Field.field("mtags." + TagService.TAG.name).in(names)))); + Field.field("mtags." + TagService.TAG.name).in(names), + TaskCriteria.activeVisibleMine()))); FilterWithCustomIntent filter = new FilterWithCustomIntent(title, title, template, null); diff --git a/astrid/proguard.cfg b/astrid/proguard.cfg index 8501379a3..175e9d6b8 100644 --- a/astrid/proguard.cfg +++ b/astrid/proguard.cfg @@ -47,6 +47,10 @@ *; } +-keepclassmembers public class com.todoroo.astrid.data.* { + *; +} + -keepclasseswithmembers class * { public (android.content.Context, android.util.AttributeSet); }