Move 'filter by tag' to a task action

astrid/AndroidManifest.xml

@@ -286,6 +286,13 @@
     </receiver>
     
     <!-- tags -->
+    <receiver android:name="com.todoroo.astrid.tags.FilterByTagExposer">
+      <intent-filter>
+        <action android:name="com.todoroo.astrid.REQUEST_ACTIONS" />
+        <action android:name="com.todoroo.astrid.FILTER_BY_TAG" />
+        <category android:name="android.intent.category.DEFAULT" />
+      </intent-filter>
+    </receiver>
     <receiver android:name="com.todoroo.astrid.tags.TagsPlugin">
       <intent-filter>
         <action android:name="com.todoroo.astrid.REQUEST_ADDONS" />

astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java

@@ -6,9 +6,15 @@ import java.util.Collections;
 import java.util.List;
 
 import android.app.AlertDialog;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.widget.ArrayAdapter;
 
 import com.timsu.astrid.R;
@@ -18,31 +24,56 @@ import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.activity.TaskListActivity;
+import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
-import com.todoroo.astrid.api.TaskContextActionExposer;
+import com.todoroo.astrid.api.TaskAction;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.data.Metadata;
-import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.tags.TagService.Tag;
 
-public class FilterByTagContextAction implements TaskContextActionExposer {
+public class FilterByTagExposer extends BroadcastReceiver {
+
+    private static final String FILTER_ACTION = "com.todoroo.astrid.FILTER_BY_TAG"; //$NON-NLS-1$
 
     @Override
-    public Object getLabel(Task task) {
-        TodorooCursor<Metadata> cursor = TagService.getInstance().getTags(task.getId());
+    public void onReceive(Context context, Intent intent) {
+        ContextManager.setContext(context);
+        long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
+        if(taskId == -1)
+            return;
+
+        TodorooCursor<Metadata> cursor = TagService.getInstance().getTags(taskId);
         try {
-            if(cursor.getCount() > 0)
-                return R.string.TAd_contextFilterByTag;
+            if(cursor.getCount() == 0)
+                return;
         } finally {
             cursor.close();
         }
-        return null;
+
+        if(AstridApiConstants.BROADCAST_REQUEST_ACTIONS.equals(intent.getAction())) {
+            final String label = context.getString(R.string.TAd_contextFilterByTag);
+            final Drawable drawable = context.getResources().getDrawable(R.drawable.silk_tag_pink);
+            Intent newIntent = new Intent(FILTER_ACTION);
+            newIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, taskId);
+            Bitmap icon = ((BitmapDrawable)drawable).getBitmap();
+            TaskAction action = new TaskAction(label,
+                    PendingIntent.getBroadcast(context, (int)taskId, newIntent, 0), icon);
+
+            // transmit
+            Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_ACTIONS);
+            broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, TagsPlugin.IDENTIFIER);
+            broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, action);
+            broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, taskId);
+            context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
+        } else if(FILTER_ACTION.equals(intent.getAction())) {
+            invoke(taskId);
+        }
     }
 
-    public void invoke(Task task) {
-        final TodorooCursor<Metadata> cursor = TagService.getInstance().getTags(
-                task.getId());
+    public void invoke(long taskId) {
         final List<String> tags;
+        final TodorooCursor<Metadata> cursor = TagService.getInstance().getTags(
+                taskId);
         try {
             if (!cursor.moveToFirst())
                 return;
@@ -59,7 +90,6 @@ public class FilterByTagContextAction implements TaskContextActionExposer {
         Collections.sort(tags, collator);
 
         DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
-
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 Tag tag = new Tag(tags.get(which), 0);

astrid/res/values/strings-core.xml

@@ -116,9 +116,6 @@
   <!-- Context Item: copy task -->
   <string name="TAd_contextCopyTask">Copy Task</string>
 
-  <!-- Context Item: filter by tag -->
-  <string name="TAd_contextFilterByTag">Filter By Tag</string>
-
   <!-- Context Item: delete task -->
   <string name="TAd_contextDeleteTask">Delete Task</string>
 

astrid/res/values/strings-tags.xml

@@ -15,6 +15,11 @@
   <!-- Tags dropdown -->
   <string name="TEA_tag_dropdown">Select a tag</string>
     
+  <!-- ========================================================== Extras == -->
+  
+    <!-- Context Item: show tag -->
+  <string name="TAd_contextFilterByTag">Show Tag</string>
+  
   <!-- ========================================================== Filters == -->
   
   <!-- filter header for tags -->

astrid/src/com/todoroo/astrid/activity/TaskListActivity.java

@@ -93,7 +93,6 @@ import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.TaskService;
-import com.todoroo.astrid.tags.FilterByTagContextAction;
 import com.todoroo.astrid.utility.AstridPreferences;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Flags;
@@ -154,7 +153,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
     @Autowired AddOnService addOnService;
 
     private final TaskContextActionExposer[] contextItemExposers = new TaskContextActionExposer[] {
-            new FilterByTagContextAction(),
             new ReminderDebugContextActions.MakeNotification(),
             new ReminderDebugContextActions.WhenReminder(),
     };