Set query when selecting filter

src/main/java/com/todoroo/astrid/reminders/Notifications.java

@@ -6,19 +6,12 @@
 package com.todoroo.astrid.reminders;
 
 import android.app.PendingIntent;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.DateUtilities;
-import com.todoroo.astrid.activity.TaskListActivity;
-import com.todoroo.astrid.activity.TaskListFragment;
-import com.todoroo.astrid.api.FilterWithCustomIntent;
 import com.todoroo.astrid.dao.TaskDao;
-import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.data.Task;
 
 import org.slf4j.Logger;
@@ -27,11 +20,8 @@ import org.tasks.Broadcaster;
 import org.tasks.R;
 import org.tasks.injection.ForApplication;
 import org.tasks.injection.InjectingBroadcastReceiver;
-import org.tasks.intents.TaskIntents;
 import org.tasks.notifications.NotificationManager;
-import org.tasks.preferences.Preferences;
 import org.tasks.reminders.NotificationActivity;
-import org.tasks.reminders.NotificationDialog;
 
 import javax.inject.Inject;
 
@@ -62,7 +52,6 @@ public class Notifications extends InjectingBroadcastReceiver {
     @Inject @ForApplication Context context;
     @Inject NotificationManager notificationManager;
     @Inject Broadcaster broadcaster;
-    @Inject Preferences preferences;
 
     @Override
     public void onReceive(Context context, Intent intent) {

src/main/java/org/tasks/activities/FilterSelectionActivity.java

@@ -6,10 +6,8 @@ import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 
 import com.todoroo.astrid.adapter.FilterAdapter;
-import com.todoroo.astrid.api.FilterListItem;
+import com.todoroo.astrid.api.Filter;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.tasks.R;
 import org.tasks.filters.FilterCounter;
 import org.tasks.filters.FilterProvider;
@@ -20,6 +18,7 @@ import javax.inject.Inject;
 public class FilterSelectionActivity extends InjectingFragmentActivity {
 
     public static final String EXTRA_FILTER_NAME = "extra_filter_name";
+    public static final String EXTRA_FILTER_SQL = "extra_filter_query";
 
     @Inject FilterProvider filterProvider;
     @Inject FilterCounter filterCounter;
@@ -35,16 +34,17 @@ public class FilterSelectionActivity extends InjectingFragmentActivity {
                 .setSingleChoiceItems(filterAdapter, -1, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        final FilterListItem selectedFilter = filterAdapter.getItem(which);
+                        final Filter selectedFilter = (Filter) filterAdapter.getItem(which);
                         setResult(RESULT_OK, new Intent() {{
                             putExtra(EXTRA_FILTER_NAME, selectedFilter.listingTitle);
+                            putExtra(EXTRA_FILTER_SQL, selectedFilter.getSqlQuery());
                         }});
-                        finish();
+                        dialog.dismiss();
                     }
                 })
-                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                .setOnDismissListener(new DialogInterface.OnDismissListener() {
                     @Override
-                    public void onCancel(DialogInterface dialog) {
+                    public void onDismiss(DialogInterface dialog) {
                         finish();
                     }
                 })