Remove task.getUUID

app/src/main/java/com/todoroo/andlib/data/DatabaseDao.java

@@ -134,8 +134,8 @@ public class DatabaseDao {
      * @return returns true on success.
      */
     public boolean createNew(final Task item) {
-        if (!item.containsValue(Task.UUID) || Task.isUuidEmpty(item.getUuidProperty())) {
+        if (!item.containsValue(Task.UUID) || Task.isUuidEmpty(item.getUuid())) {
-            item.setUuidProperty(UUIDHelper.newUUID());
+            item.setUuid(UUIDHelper.newUUID());
         }
 
         item.clearValue(AbstractModel.ID_PROPERTY);

app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java

@@ -514,7 +514,7 @@ public class TaskListFragment extends InjectingFragment implements
                     taskCreator.addToCalendar(task);
                     onTaskListItemClicked(task);
                     loadTaskListContent();
-                    onTaskCreated(task.getUUID());
+                    onTaskCreated(task.getUuid());
                 }
             }
         } else if (requestCode == REQUEST_EDIT_FILTER) {

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

@@ -223,7 +223,7 @@ public abstract class TaskDao {
 
     private ContentValues handleSQLiteConstraintException(Task task) {
         TodorooCursor cursor = dao.query(Query.select(Task.ID).where(
-                Task.UUID.eq(task.getUUID())));
+                Task.UUID.eq(task.getUuid())));
         if (cursor.getCount() > 0) {
             cursor.moveToFirst();
             task.setId(cursor.get(Task.ID));
@@ -315,7 +315,7 @@ public abstract class TaskDao {
             saveExisting(item);
         } catch (SQLiteConstraintException e) {
             Timber.e(e, e.getMessage());
-            String uuid = item.getUUID();
+            String uuid = item.getUuid();
             TodorooCursor tasksWithUUID = dao.query(Query.select(
                     SQL_CONSTRAINT_MERGE_PROPERTIES).where(
                     Task.UUID.eq(uuid)));

app/src/main/java/com/todoroo/astrid/data/Task.java

@@ -255,7 +255,13 @@ public class Task extends AbstractModel {
     }
 
     public String getUuid() {
-        return getUuidHelper(UUID);
+        if(setValues != null && setValues.containsKey(UUID.name)) {
+            return setValues.getAsString(UUID.name);
+        } else if(values != null && values.containsKey(UUID.name)) {
+            return values.getAsString(UUID.name);
+        } else {
+            return NO_UUID;
+        }
     }
 
     // --- parcelable helpers
@@ -659,16 +665,6 @@ public class Task extends AbstractModel {
         }
     }
 
-    private String getUuidHelper(StringProperty uuid) {
-        if(setValues != null && setValues.containsKey(uuid.name)) {
-            return setValues.getAsString(uuid.name);
-        } else if(values != null && values.containsKey(uuid.name)) {
-            return values.getAsString(uuid.name);
-        } else {
-            return NO_UUID;
-        }
-    }
-
     public void setUuid(String uuid) {
         if (setValues == null) {
             setValues = new ContentValues();
@@ -684,12 +680,4 @@ public class Task extends AbstractModel {
     public static boolean isUuidEmpty(String uuid) {
         return NO_UUID.equals(uuid) || TextUtils.isEmpty(uuid);
     }
-
-    public String getUuidProperty() {
-        return getValue(UUID);
-    }
-
-    public void setUuidProperty(String uuidProperty) {
-        setValue(UUID, uuidProperty);
-    }
 }

app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java

@@ -196,7 +196,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
 
     @Override
     public void apply(Task task) {
-        if (synchronizeTags(task.getId(), task.getUUID())) {
+        if (synchronizeTags(task.getId(), task.getUuid())) {
             Flags.set(Flags.TAGS_CHANGED);
             task.setModificationDate(DateUtilities.now());
         }
@@ -362,7 +362,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
 
     @Override
     public boolean hasChanges(Task original) {
-        Set<TagData> existingSet = newHashSet(tagService.getTagDataForTask(original.getUUID()));
+        Set<TagData> existingSet = newHashSet(tagService.getTagDataForTask(original.getUuid()));
         Set<TagData> selectedSet = newHashSet(selectedTags);
         return !existingSet.equals(selectedSet);
     }