From 8cf0db306f1f57611c90d98cecb31e85c63f7d1e Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Mon, 3 Oct 2011 21:57:51 -0700
Subject: [PATCH] Removed some warnings

---
 astrid/src/com/todoroo/astrid/activity/Eula.java  |  1 -
 .../com/todoroo/astrid/adapter/TaskAdapter.java   | 15 ++-------------
 .../com/todoroo/astrid/widget/TasksWidget.java    |  6 ++++--
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/activity/Eula.java b/astrid/src/com/todoroo/astrid/activity/Eula.java
index b071688ed..5d06e5539 100644
--- a/astrid/src/com/todoroo/astrid/activity/Eula.java
+++ b/astrid/src/com/todoroo/astrid/activity/Eula.java
@@ -102,7 +102,6 @@ public final class Eula {
         return true;
     }
 
-    @SuppressWarnings("unused")
     private static void accept(Activity activity) {
         if (activity instanceof EulaCallback) {
             ((EulaCallback)activity).eulaAccepted();
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index cfe8bb354..c7fb65653 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -74,7 +74,6 @@ import com.todoroo.astrid.api.TaskDecorationExposer;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.TaskAdapterAddOnManager;
 import com.todoroo.astrid.notes.NotesDecorationExposer;
-import com.todoroo.astrid.notes.NotesPlugin;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.TaskService;
@@ -798,9 +797,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
         @Override
         public synchronized void addNew(long taskId, String addOn, final TaskAction item, ViewHolder thisViewHolder) {
-            if(isIntroTask(taskId) && !NotesPlugin.IDENTIFIER.equals(addOn))
-                return;
-
             addIfNotExists(taskId, addOn, item);
             if(mBar != null) {
                 ListView listView = activity.getListView();
@@ -914,7 +910,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                 mBar.dismiss();
             mBar = null;
 
-            if(position == 0 && !isIntroTask(taskId)) {
+            if(position == 0) {
                 Intent intent = new Intent(activity, TaskEditActivity.class);
                 intent.putExtra(TaskEditActivity.TOKEN_ID, taskId);
                 activity.startActivityForResult(intent, TaskListActivity.ACTIVITY_EDIT_TASK);
@@ -943,8 +939,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                     activity.getString(R.string.TAd_actionEditTask));
             mBarListener.initialize(viewHolder.task.getId());
 
-            if(!isIntroTask(viewHolder.task.getId()))
-                mBarListener.addWithAction(editAction, null);
+            mBarListener.addWithAction(editAction, null);
 
             if(collection != null) {
                 for(TaskAction item : collection) {
@@ -980,12 +975,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         }
     }
 
-    private boolean isIntroTask(long taskId) {
-        /*if(taskId <= StartupService.INTRO_TASK_SIZE)
-            return true;//*/
-        return false;
-    }
-
     /**
      * Call me when the parent presses trackpad
      */
diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
index cf112bbed..34e4093ec 100644
--- a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
+++ b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
@@ -216,8 +216,10 @@ public class TasksWidget extends AppWidgetProvider {
             }
             listIntent.putExtra(TaskListActivity.TOKEN_SOURCE, Constants.SOURCE_WIDGET);
             listIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-            listIntent.putExtra(TaskListActivity.TOKEN_FILTER, filter);
-            listIntent.setAction("L" + widgetId + filter.sqlQuery);
+            if(filter != null) {
+                listIntent.putExtra(TaskListActivity.TOKEN_FILTER, filter);
+                listIntent.setAction("L" + widgetId + filter.sqlQuery);
+            }
             PendingIntent pendingIntent = PendingIntent.getActivity(context, widgetId,
                     listIntent, PendingIntent.FLAG_CANCEL_CURRENT);
             views.setOnClickPendingIntent(R.id.taskbody, pendingIntent);