Moved some quick action processing to a background thread, removed extra query, temporarily removed task rabbit querying

astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java

@@ -42,12 +42,8 @@ public class LinkActionExposer {
 
     private PackageManager pm;
 
-    public List<TaskAction> getActionsForTask(Context context, long taskId) {
+    public List<TaskAction> getActionsForTask(Context context, Task task) {
         List<TaskAction> result = new ArrayList<TaskAction>();
-        if(taskId == -1)
-            return result;
-
-        Task task = PluginServices.getTaskService().fetchById(taskId, Task.ID, Task.TITLE, Task.NOTES);
         if (task == null) return result;
 
         String notes = task.getValue(Task.NOTES);
@@ -55,7 +51,7 @@ public class LinkActionExposer {
         Linkify.addLinks(titleSpan, Linkify.ALL);
 
         URLSpan[] urlSpans = titleSpan.getSpans(0, titleSpan.length(), URLSpan.class);
-        boolean hasAttachments = FileMetadata.taskHasAttachments(taskId);
+        boolean hasAttachments = FileMetadata.taskHasAttachments(task.getId());
         if(urlSpans.length == 0 && TextUtils.isEmpty(notes) &&
                 !hasAttachments)
             return result;
@@ -67,7 +63,7 @@ public class LinkActionExposer {
             int start = titleSpan.getSpanStart(urlSpan);
             int end = titleSpan.getSpanEnd(urlSpan);
             String text = titleSpan.subSequence(start, end).toString();
-            TaskAction taskAction = createLinkAction(context, taskId, url, text);
+            TaskAction taskAction = createLinkAction(context, task.getId(), url, text);
             if (taskAction != null)
                 result.add(taskAction);
         }

astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java

@@ -82,8 +82,6 @@ import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.service.ThemeService;
-import com.todoroo.astrid.taskrabbit.TaskRabbitDataService;
-import com.todoroo.astrid.taskrabbit.TaskRabbitTaskContainer;
 import com.todoroo.astrid.timers.TimerDecorationExposer;
 import com.todoroo.astrid.ui.CheckableImageView;
 import com.todoroo.astrid.utility.Constants;
@@ -427,9 +425,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         // image view
         final AsyncImageView pictureView = viewHolder.picture; {
             if (pictureView != null) {
-                TaskRabbitTaskContainer container = TaskRabbitDataService.getInstance().getContainerForTask(task);
+//                TaskRabbitTaskContainer container = TaskRabbitDataService.getInstance().getContainerForTask(task);
 
-                if(task.getValue(Task.USER_ID) == Task.USER_ID_SELF && !container.isTaskRabbit()) {
+                if(task.getValue(Task.USER_ID) == Task.USER_ID_SELF /*&& !container.isTaskRabbit()*/) {
                     pictureView.setVisibility(View.GONE);
                     if (viewHolder.pictureBorder != null)
                         viewHolder.pictureBorder.setVisibility(View.GONE);
@@ -438,7 +436,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                     if (viewHolder.pictureBorder != null)
                         viewHolder.pictureBorder.setVisibility(View.VISIBLE);
                     pictureView.setUrl(null);
-                    if (container.isTaskRabbit()) {
+                    if (false/*container.isTaskRabbit()*/) {
                         pictureView.setDefaultImageResource(R.drawable.task_rabbit_image);
                     } else if(task.getValue(Task.USER_ID) == Task.USER_ID_UNASSIGNED)
                         pictureView.setDefaultImageResource(R.drawable.icn_anyone_transparent);
@@ -778,34 +776,33 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         public void run() {
             AndroidUtilities.sleepDeep(500L);
             final TodorooCursor<Task> fetchCursor = taskService.fetchFiltered(
-                    query.get(), null, Task.ID, Task.TITLE, Task.DETAILS, Task.DETAILS_DATE,
+                    query.get(), null, Task.ID, Task.TITLE, Task.NOTES, Task.COMPLETION_DATE);
-                    Task.MODIFICATION_DATE, Task.COMPLETION_DATE);
+
+            try {
+                Task task = new Task();
+                LinkActionExposer linkActionExposer = new LinkActionExposer();
 
+                for(fetchCursor.moveToFirst(); !fetchCursor.isAfterLast(); fetchCursor.moveToNext()) {
+                    task.clear();
+                    task.readFromCursor(fetchCursor);
+                    if(task.isCompleted())
+                        continue;
+
+                    List<TaskAction> actions = linkActionExposer.
+                            getActionsForTask(ContextManager.getContext(), task);
+                    if (actions.size() > 0)
+                        taskActionLoader.put(task.getId(), actions.get(0));
+                }
+            } finally {
+                fetchCursor.close();
+            }
             final Activity activity = fragment.getActivity();
             if (activity != null) {
                 activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        try {
+                        if(taskActionLoader.size() > 0) {
-                            Task task = new Task();
+                            notifyDataSetChanged();
-                            LinkActionExposer linkActionExposer = new LinkActionExposer();
-
-                            for(fetchCursor.moveToFirst(); !fetchCursor.isAfterLast(); fetchCursor.moveToNext()) {
-                                task.clear();
-                                task.readFromCursor(fetchCursor);
-                                if(task.isCompleted())
-                                    continue;
-
-                                List<TaskAction> actions = linkActionExposer.
-                                        getActionsForTask(ContextManager.getContext(), task.getId());
-                                if (actions.size() > 0)
-                                    taskActionLoader.put(task.getId(), actions.get(0));
-                            }
-                            if(taskActionLoader.size() > 0) {
-                                notifyDataSetChanged();
-                            }
-                        } finally {
-                            fetchCursor.close();
                         }
                     }
                 });