Hide TaskAttachment cursors

api/src/main/java/com/todoroo/astrid/data/StoreObject.java

@@ -72,12 +72,6 @@ public class StoreObject extends AbstractModel {
         return defaultValues;
     }
 
-    // --- data access boilerplate
-
-    public StoreObject() {
-        super();
-    }
-
     @Override
     public long getId() {
         return getIdHelper(ID);

api/src/main/java/com/todoroo/astrid/data/TaskAttachment.java

@@ -12,7 +12,6 @@ import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.Table;
-import com.todoroo.andlib.data.TodorooCursor;
 
 /**
  * Data Model which represents a user.
@@ -116,16 +115,6 @@ public final class TaskAttachment extends RemoteModel {
         return attachment;
     }
 
-    // --- data access boilerplate
-
-    public TaskAttachment() {
-        super();
-    }
-
-    public TaskAttachment(TodorooCursor<TaskAttachment> cursor) {
-        super(cursor);
-    }
-
     @Override
     public long getId() {
         return getIdHelper(ID);

api/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java

@@ -12,7 +12,6 @@ import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.Table;
-import com.todoroo.andlib.data.TodorooCursor;
 
 /**
  * Data Model which represents a user.
@@ -72,16 +71,6 @@ public final class TaskListMetadata extends RemoteModel {
         return defaultValues;
     }
 
-    // --- data access boilerplate
-
-    public TaskListMetadata() {
-        super();
-    }
-
-    public TaskListMetadata(TodorooCursor<TaskListMetadata> cursor) {
-        super(cursor);
-    }
-
     @Override
     public long getId() {
         return getIdHelper(ID);

astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java

@@ -5,40 +5,37 @@
  */
 package com.todoroo.astrid.dao;
 
-import com.todoroo.andlib.data.TodorooCursor;
+import com.todoroo.andlib.data.Callback;
+import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Query;
-import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.TaskAttachment;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-/**
- * Data Access layer for {@link TagData}-related operations.
- *
- * @author Tim Su <tim@todoroo.com>
- *
- */
 @Singleton
 public class TaskAttachmentDao extends RemoteModelDao<TaskAttachment> {
 
     @Inject
-	public TaskAttachmentDao(Database database) {
+    public TaskAttachmentDao(Database database) {
         super(TaskAttachment.class);
         setDatabase(database);
     }
 
     public boolean taskHasAttachments(String taskUuid) {
-        TodorooCursor<TaskAttachment> files = query(Query.select(TaskAttachment.TASK_UUID).where(
-                        Criterion.and(TaskAttachment.TASK_UUID.eq(taskUuid),
-                                TaskAttachment.DELETED_AT.eq(0))).limit(1));
-        try {
-            return files.getCount() > 0;
-        } finally {
-            files.close();
-        }
+        return count(byUuid(taskUuid, TaskAttachment.TASK_UUID).limit(1)) > 0;
     }
 
+    public void getAttachments(String taskUuid, Callback<TaskAttachment> callback) {
+        query(callback, byUuid(taskUuid, TaskAttachment.PROPERTIES));
+    }
+
+    private static Query byUuid(String taskUuid, Property<?>... properties) {
+        return Query.select(properties).where(
+                Criterion.and(TaskAttachment.TASK_UUID.eq(taskUuid),
+                        TaskAttachment.DELETED_AT.eq(0))
+        );
+    }
 }
 

astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java

@@ -20,9 +20,7 @@ import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
 
-import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.andlib.sql.Criterion;
-import com.todoroo.andlib.sql.Query;
+import com.todoroo.andlib.data.Callback;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
@@ -89,19 +87,13 @@ public class FilesControlSet extends PopupControlSet {
 
     public void refreshMetadata() {
         if (model != null) {
-            TodorooCursor<TaskAttachment> cursor = taskAttachmentDao.query(
-                    Query.select(TaskAttachment.PROPERTIES)
-                    .where(Criterion.and(TaskAttachment.TASK_UUID.eq(model.getUuid()),
-                            TaskAttachment.DELETED_AT.eq(0))));
-            try {
-                files.clear();
-                for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
-                    TaskAttachment attachment = new TaskAttachment(cursor);
+            files.clear();
+            taskAttachmentDao.getAttachments(model.getUuid(), new Callback<TaskAttachment>() {
+                @Override
+                public void apply(TaskAttachment attachment) {
                     files.add(attachment);
                 }
-            } finally {
-                cursor.close();
-            }
+            });
             validateFiles();
             if (initialized) {
                 afterInflate();
@@ -128,7 +120,6 @@ public class FilesControlSet extends PopupControlSet {
 
     @Override
     protected void readFromTaskOnInitialize() {
-        // TODO Auto-generated method stub
     }
 
     @Override
@@ -165,6 +156,7 @@ public class FilesControlSet extends PopupControlSet {
                         @Override
                         public void onClick(DialogInterface d, int which) {
                             if (RemoteModel.isValidUuid(m.getUUID())) {
+                                // TODO: delete
                                 m.setDeletedAt(DateUtilities.now());
                                 taskAttachmentDao.saveExisting(m);
                             } else {
@@ -297,7 +289,5 @@ public class FilesControlSet extends PopupControlSet {
             return "";
         }
         return name.substring(extension + 1).toUpperCase();
-
     }
-
 }