Convert query to toList

app/src/main/java/com/todoroo/astrid/dao/TaskDao.java

@@ -296,8 +296,7 @@ public abstract class TaskDao {
      * Construct a query with SQL DSL objects
      */
     public TodorooCursor query(Query query) {
-        query.from(Task.TABLE);
+        String queryString = query.from(Task.TABLE).toString();
-        String queryString = query.toString();
         if (BuildConfig.DEBUG) {
             Timber.v(queryString);
         }

app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java

@@ -19,6 +19,7 @@ import org.tasks.data.TaskListMetadata;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -146,13 +147,12 @@ class AstridOrderedListFragmentHelper {
 
         if(chained.size() > 0) {
             // move recurring items to item parent
-            TodorooCursor recurring = taskDao.query(Query.select(Task.UUID, Task.RECURRENCE).where(
+            List<Task> tasks = taskDao.toList(Query.select(Task.UUID, Task.RECURRENCE).where(
                     Criterion.and(Task.UUID.in(chained.toArray(new String[chained.size()])),
                             Task.RECURRENCE.isNotNull(), Functions.length(Task.RECURRENCE).gt(0))));
-            try {
+
             boolean madeChanges = false;
-                for (recurring.moveToFirst(); !recurring.isAfterLast(); recurring.moveToNext()) {
+            for (Task t : tasks) {
-                    Task t = new Task(recurring);
                 if (!TextUtils.isEmpty(t.getRecurrence())) {
                     updater.moveToParentOf(t.getUuid(), itemId);
                     madeChanges = true;
@@ -162,9 +162,6 @@ class AstridOrderedListFragmentHelper {
             if (madeChanges) {
                 updater.writeSerialization(list, updater.serializeTree());
             }
-            } finally {
-                recurring.close();
-            }
 
             chainedCompletions.put(itemId, chained);
             taskAdapter.notifyDataSetInvalidated();