Add getters to replace getValues

* Task
* UserActivity
* RemoteModel
* TagData
* Metadata
* TaskList
* TaskAttachment

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

@@ -122,4 +122,20 @@ public class Metadata extends AbstractModel {
     // --- parcelable helpers
 
     private static final Creator<Metadata> CREATOR = new ModelCreator<>(Metadata.class);
+
+    public Long getDeletionDate() {
+        return getValue(DELETION_DATE);
+    }
+
+    public Long getTask() {
+        return getValue(TASK);
+    }
+
+    public Long getCreationDate() {
+        return getValue(CREATION_DATE);
+    }
+
+    public String getKey() {
+        return getValue(KEY);
+    }
 }

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

@@ -61,6 +61,10 @@ abstract public class RemoteModel extends AbstractModel {
         }
     }
 
+    public String getUuidProperty() {
+        return getValue(UUID_PROPERTY);
+    }
+
     protected String getUuidHelper(StringProperty uuid) {
         if(setValues != null && setValues.containsKey(uuid.name)) {
             return setValues.getAsString(uuid.name);
@@ -107,12 +111,12 @@ abstract public class RemoteModel extends AbstractModel {
         public static String getPictureHash(TagData tagData) {
             long tag_date = 0;
             if (tagData.containsValue(TagData.CREATION_DATE)) {
-                tag_date = tagData.getValue(TagData.CREATION_DATE);
+                tag_date = tagData.getCreationDate();
             }
             if (tag_date == 0) {
                 tag_date = currentTimeMillis();
             }
-            return String.format("cached::%s%s", tagData.getValue(TagData.NAME), tag_date);
+            return String.format("cached::%s%s", tagData.getName(), tag_date);
         }
 
         @TargetApi(Build.VERSION_CODES.FROYO)

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

@@ -211,4 +211,31 @@ public final class TagData extends RemoteModel {
         }
     }
 
+    public Long getCreationDate() {
+        return getValue(CREATION_DATE);
+    }
+
+    public String getName() {
+        return getValue(NAME);
+    }
+
+    public String getTagOrdering() {
+        return getValue(TAG_ORDERING);
+    }
+
+    public Long getLastAutosync() {
+        return getValue(LAST_AUTOSYNC);
+    }
+
+    public String getUUID() {
+        return getValue(UUID);
+    }
+
+    public Integer getTaskCount() {
+        return getValue(TASK_COUNT);
+    }
+
+    public String getMembers() {
+        return getValue(MEMBERS);
+    }
 }

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

@@ -332,6 +332,7 @@ public class Task extends RemoteModel {
 
     /** urgency array index -> significance */
     public static final int URGENCY_NONE = 0;
+
     public static final int URGENCY_TODAY = 1;
     public static final int URGENCY_TOMORROW = 2;
     public static final int URGENCY_DAY_AFTER = 3;
@@ -340,16 +341,15 @@ public class Task extends RemoteModel {
     public static final int URGENCY_NEXT_MONTH = 6;
     public static final int URGENCY_SPECIFIC_DAY = 7;
     public static final int URGENCY_SPECIFIC_DAY_TIME = 8;
-
     /** hide until array index -> significance */
     public static final int HIDE_UNTIL_NONE = 0;
+
     public static final int HIDE_UNTIL_DUE = 1;
     public static final int HIDE_UNTIL_DAY_BEFORE = 2;
     public static final int HIDE_UNTIL_WEEK_BEFORE = 3;
     public static final int HIDE_UNTIL_SPECIFIC_DAY = 4;
     public static final int HIDE_UNTIL_SPECIFIC_DAY_TIME = 5;
     public static final int HIDE_UNTIL_DUE_TIME = 6;
-
     /**
      * Creates due date for this task. If this due date has no time associated,
      * we move it to the last millisecond of the day.
@@ -461,22 +461,22 @@ public class Task extends RemoteModel {
         if(!hasDueDate()) {
             return false;
         }
-        return hasDueTime(getValue(Task.DUE_DATE));
+        return hasDueTime(getDueDate());
     }
 
     public boolean isOverdue() {
-        long dueDate = getValue(Task.DUE_DATE);
+        long dueDate = getDueDate();
         long compareTo = hasDueTime() ? DateUtilities.now() : DateUtilities.getStartOfDay(DateUtilities.now());
 
         return dueDate < compareTo;
     }
 
     public boolean repeatAfterCompletion() {
-        return getValue(Task.RECURRENCE).contains("FROM=COMPLETION");
+        return getRecurrence().contains("FROM=COMPLETION");
     }
 
     public String sanitizedRecurrence() {
-        return getValue(Task.RECURRENCE).replaceAll("BYDAY=;","").replaceAll(";?FROM=[^;]*", "");  //$NON-NLS-1$//$NON-NLS-2$
+        return getRecurrence().replaceAll("BYDAY=;", "").replaceAll(";?FROM=[^;]*", "");  //$NON-NLS-1$//$NON-NLS-2$
     }
 
     /**
@@ -486,4 +486,95 @@ public class Task extends RemoteModel {
         return dueDate > 0 && (dueDate % 60000 > 0);
     }
 
+    public Long getDueDate() {
+        return getValue(DUE_DATE);
+    }
+
+    public String getRecurrence() {
+        return getValue(RECURRENCE);
+    }
+
+    public Long getCreationDate() {
+        return getValue(CREATION_DATE);
+    }
+
+    public String getUUID() {
+        return getValue(UUID);
+    }
+
+    public String getTitle() {
+        return getValue(TITLE);
+    }
+
+    public String getDetails() {
+        return getValue(DETAILS);
+    }
+
+    public Long getDeletionDate() {
+        return getValue(DELETION_DATE);
+    }
+
+    public Long getHideUntil() {
+        return getValue(HIDE_UNTIL);
+    }
+
+    public Long getReminderLast() {
+        return getValue(REMINDER_LAST);
+    }
+
+    public Long getReminderSnooze() {
+        return getValue(REMINDER_SNOOZE);
+    }
+
+    public Integer getElapsedSeconds() {
+        return getValue(ELAPSED_SECONDS);
+    }
+
+    public Long getTimerStart() {
+        return getValue(TIMER_START);
+    }
+
+    public Long getRepeatUntil() {
+        return getValue(REPEAT_UNTIL);
+    }
+
+    public String getCalendarURI() {
+        return getValue(CALENDAR_URI);
+    }
+
+    public String getUserID() {
+        return getValue(USER_ID);
+    }
+
+    public Integer getImportance() {
+        return getValue(IMPORTANCE);
+    }
+
+    public Long getCompletionDate() {
+        return getValue(COMPLETION_DATE);
+    }
+
+    public Long getDetailsDate() {
+        return getValue(DETAILS_DATE);
+    }
+
+    public String getNotes() {
+        return getValue(NOTES);
+    }
+
+    public Long getModificationDate() {
+        return getValue(MODIFICATION_DATE);
+    }
+
+    public Integer getReminderFlags() {
+        return getValue(REMINDER_FLAGS);
+    }
+
+    public Long getReminderPeriod() {
+        return getValue(REMINDER_PERIOD);
+    }
+
+    public Integer getEstimatedSeconds() {
+        return getValue(ESTIMATED_SECONDS);
+    }
 }

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

@@ -168,4 +168,20 @@ public final class TaskAttachment extends RemoteModel {
     // --- parcelable helpers
 
     public static final Creator<TaskAttachment> CREATOR = new ModelCreator<>(TaskAttachment.class);
+
+    public String getName() {
+        return getValue(NAME);
+    }
+
+    public String getContentType() {
+        return getValue(CONTENT_TYPE);
+    }
+
+    public String getUUID() {
+        return getValue(UUID);
+    }
+
+    public String getFilePath() {
+        return getValue(FILE_PATH);
+    }
 }

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

@@ -119,4 +119,8 @@ public final class TaskListMetadata extends RemoteModel {
     // --- parcelable helpers
 
     public static final Creator<TaskListMetadata> CREATOR = new ModelCreator<>(TaskListMetadata.class);
+
+    public String getTaskIDs() {
+        return getValue(TASK_IDS);
+    }
 }

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

@@ -107,4 +107,12 @@ public class UserActivity extends RemoteModel {
     }
 
     private static final Creator<UserActivity> CREATOR = new ModelCreator<>(UserActivity.class);
+
+    public Long getCreatedAt() {
+        return getValue(CREATED_AT);
+    }
+
+    public String getMessage() {
+        return getValue(MESSAGE);
+    }
 }

astrid/src/instrumentTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java

@@ -45,7 +45,7 @@ public class MetadataDaoTests extends DatabaseTestCase {
         long happyId = metadata.getId();
         assertNotSame(Metadata.NO_ID, happyId);
         metadata = metadataDao.fetch(happyId, KEYS);
-        assertEquals("happy", metadata.getValue(Metadata.KEY));
+        assertEquals("happy", metadata.getKey());
 
         // create "sad"
         metadata = new Metadata();
@@ -67,9 +67,9 @@ public class MetadataDaoTests extends DatabaseTestCase {
 
         // check state
         metadata = metadataDao.fetch(happyId, KEYS);
-        assertEquals("happy", metadata.getValue(Metadata.KEY));
+        assertEquals("happy", metadata.getKey());
         metadata = metadataDao.fetch(sadId, KEYS);
-        assertEquals("melancholy", metadata.getValue(Metadata.KEY));
+        assertEquals("melancholy", metadata.getKey());
 
         // delete sad
         assertTrue(metadataDao.delete(sadId));
@@ -78,7 +78,7 @@ public class MetadataDaoTests extends DatabaseTestCase {
         assertEquals(1, cursor.getCount());
         cursor.moveToFirst();
         metadata.readFromCursor(cursor);
-        assertEquals("happy", metadata.getValue(Metadata.KEY));
+        assertEquals("happy", metadata.getKey());
         cursor.close();
     }
 
@@ -108,10 +108,10 @@ public class MetadataDaoTests extends DatabaseTestCase {
         assertEquals(2, cursor.getCount());
         cursor.moveToFirst();
         metadata.readFromCursor(cursor);
-        assertEquals("with1", metadata.getValue(Metadata.KEY));
+        assertEquals("with1", metadata.getKey());
         cursor.moveToNext();
         metadata.readFromCursor(cursor);
-        assertEquals("with1", metadata.getValue(Metadata.KEY));
+        assertEquals("with1", metadata.getKey());
         cursor.close();
 
         cursor = metadataDao.query(
@@ -188,7 +188,7 @@ public class MetadataDaoTests extends DatabaseTestCase {
         assertEquals(1, cursor.getCount());
         cursor.moveToFirst();
         metadata.readFromCursor(cursor);
-        assertEquals("with2", metadata.getValue(Metadata.KEY));
+        assertEquals("with2", metadata.getKey());
         cursor.close();
     }
 

astrid/src/instrumentTest/java/com/todoroo/astrid/dao/TaskDaoTests.java

@@ -45,7 +45,7 @@ public class TaskDaoTests extends DatabaseTestCase {
         long happyId = task.getId();
         assertNotSame(Task.NO_ID, happyId);
         task = taskDao.fetch(happyId, TITLES);
-        assertEquals("happy", task.getValue(Task.TITLE));
+        assertEquals("happy", task.getTitle());
 
         // create task "sad"
         task = new Task();
@@ -68,9 +68,9 @@ public class TaskDaoTests extends DatabaseTestCase {
 
         // check state
         task = taskDao.fetch(happyId, TITLES);
-        assertEquals("happy", task.getValue(Task.TITLE));
+        assertEquals("happy", task.getTitle());
         task = taskDao.fetch(sadId,TITLES);
-        assertEquals("melancholy", task.getValue(Task.TITLE));
+        assertEquals("melancholy", task.getTitle());
     }
 
     /**

astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java

@@ -95,28 +95,28 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
         Metadata metadata = gtasksMetadataService.getTaskMetadata(task.getId());
         long parent = metadata.getValue(GtasksMetadata.PARENT_TASK);
         if(expectedParent == null)
-            assertEquals("Task " + task.getValue(Task.TITLE) + " parent none", 0, parent);
+            assertEquals("Task " + task.getTitle() + " parent none", 0, parent);
         else
-            assertEquals("Task " + task.getValue(Task.TITLE) + " parent " +
+            assertEquals("Task " + task.getTitle() + " parent " +
-                    expectedParent.getValue(Task.TITLE), expectedParent.getId(), parent);
+                    expectedParent.getTitle(), expectedParent.getId(), parent);
     }
 
     private void thenExpectSibling(Task task, Task expectedSibling) {
         long sibling = gtasksTaskListUpdater.siblings.get(task.getId());
         if(expectedSibling == null)
-            assertEquals("Task " + task.getValue(Task.TITLE) + " sibling null", 0L, sibling);
+            assertEquals("Task " + task.getTitle() + " sibling null", 0L, sibling);
         else
-            assertEquals("Task " + task.getValue(Task.TITLE) + " sibling " +
+            assertEquals("Task " + task.getTitle() + " sibling " +
-                    expectedSibling.getValue(Task.TITLE), expectedSibling.getId(), sibling);
+                    expectedSibling.getTitle(), expectedSibling.getId(), sibling);
     }
 
     private void thenExpectParent(Task task, Task expectedParent) {
         long parent = gtasksTaskListUpdater.parents.get(task.getId());
         if(expectedParent == null)
-            assertEquals("Task " + task.getValue(Task.TITLE) + " parent null", 0L, parent);
+            assertEquals("Task " + task.getTitle() + " parent null", 0L, parent);
         else
-            assertEquals("Task " + task.getValue(Task.TITLE) + " parent " +
+            assertEquals("Task " + task.getTitle() + " parent " +
-                    expectedParent.getValue(Task.TITLE), expectedParent.getId(), parent);
+                    expectedParent.getTitle(), expectedParent.getId(), parent);
     }
 
     @Override

astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java

@@ -139,15 +139,15 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
         try {
             for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 Task task = new Task(cursor);
-                System.err.println("Task: " + task.getValue(Task.TITLE) + ", due: " + task.getValue(Task.DUE_DATE));
+                System.err.println("Task: " + task.getTitle() + ", due: " + task.getDueDate());
             }
             assertEquals(1, cursor.getCount());
             cursor.moveToFirst();
             t.readFromCursor(cursor);
 
-            assertEquals(title, t.getValue(Task.TITLE));
+            assertEquals(title, t.getTitle());
             assertFalse(t.isCompleted());
-            long newDueDate = t.getValue(Task.DUE_DATE);
+            long newDueDate = t.getDueDate();
             assertTrue(t.hasDueTime());
 
             long fromDate = (fromCompletion? completionDate : dueDate);

astrid/src/instrumentTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java

@@ -78,7 +78,7 @@ public class QuickAddMarkupTest extends DatabaseTestCase {
     }
 
     private void assertTitleBecomes(String title) {
-        assertEquals(title, task.getValue(Task.TITLE));
+        assertEquals(title, task.getTitle());
     }
 
     private void whenTitleIs(String title) {
@@ -89,7 +89,7 @@ public class QuickAddMarkupTest extends DatabaseTestCase {
     }
 
     private void assertImportanceIs(int importance) {
-        assertEquals(importance, (int)task.getValue(Task.IMPORTANCE));
+        assertEquals(importance, (int)task.getImportance());
     }
 
 }

astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java

@@ -40,7 +40,7 @@ public class TitleParserTest extends DatabaseTestCase {
       taskService.save(task);
       assertFalse(task.hasDueTime());
       assertFalse(task.hasDueDate());
-      assertEquals(task.getValue(Task.RECURRENCE), nothing.getValue(Task.RECURRENCE));
+      assertEquals(task.getRecurrence(), nothing.getRecurrence());
   }
 
   /** Tests correct date is parsed **/
@@ -64,7 +64,7 @@ public class TitleParserTest extends DatabaseTestCase {
       for (int i = 0; i < 23; i++) {
           String testTitle = "Jog on " + titleMonthStrings[i] + " 12.";
           insertTitleAddTask(testTitle, task);
-          Date date = newDate(task.getValue(Task.DUE_DATE));
+          Date date = newDate(task.getDueDate());
           assertEquals(date.getMonth(), i/2);
           assertEquals(date.getDate(), 12);
       }
@@ -76,7 +76,7 @@ public class TitleParserTest extends DatabaseTestCase {
       for (int i = 1; i < 13; i++) {
           String testTitle = "Jog on " + i + "/12/13";
           insertTitleAddTask(testTitle, task);
-          Date date = newDate(task.getValue(Task.DUE_DATE));
+          Date date = newDate(task.getDueDate());
           assertEquals(date.getMonth(), i-1);
           assertEquals(date.getDate(), 12);
           assertEquals(date.getYear(), 113);
@@ -88,7 +88,7 @@ public class TitleParserTest extends DatabaseTestCase {
       Task task = new Task();
       String testTitle = "Jog on 23:21.";
       insertTitleAddTask(testTitle, task);
-      Date date = newDate(task.getValue(Task.DUE_DATE));
+      Date date = newDate(task.getDueDate());
       assertEquals(date.getMinutes(), 21);
       assertEquals(date.getHours(), 23);
   }
@@ -98,7 +98,7 @@ public class TitleParserTest extends DatabaseTestCase {
       Task task = new Task();
       String testTitle = "Jog at 8:33 PM.";
       insertTitleAddTask(testTitle, task);
-      Date date = newDate(task.getValue(Task.DUE_DATE));
+      Date date = newDate(task.getDueDate());
       assertEquals(date.getMinutes(), 33);
       assertEquals(date.getHours(), 20);
   }
@@ -108,7 +108,7 @@ public class TitleParserTest extends DatabaseTestCase {
       Task task = new Task();
       String testTitle = "Jog at 8 PM.";
       insertTitleAddTask(testTitle, task);
-      Date date = newDate(task.getValue(Task.DUE_DATE));
+      Date date = newDate(task.getDueDate());
       assertEquals(date.getMinutes(), 0);
       assertEquals(date.getHours(), 20);
   }
@@ -118,7 +118,7 @@ public class TitleParserTest extends DatabaseTestCase {
       Task task = new Task();
       String testTitle = "Jog at 8 o'clock AM.";
       insertTitleAddTask(testTitle, task);
-      Date date = newDate(task.getValue(Task.DUE_DATE));
+      Date date = newDate(task.getDueDate());
       assertEquals(date.getMinutes(), 0);
       assertEquals(date.getHours(), 8);
   }
@@ -133,7 +133,7 @@ public class TitleParserTest extends DatabaseTestCase {
       };
       for (String testTitle: testTitles) {
           insertTitleAddTask(testTitle, task);
-          Date date = newDate(task.getValue(Task.DUE_DATE));
+          Date date = newDate(task.getDueDate());
           assertEquals(date.getMinutes(), 0);
           assertEquals(date.getHours(), 8);
       }
@@ -151,7 +151,7 @@ public class TitleParserTest extends DatabaseTestCase {
       };
       for (String testTitle: testTitles) {
           insertTitleAddTask(testTitle, task);
-          Date date = newDate(task.getValue(Task.DUE_DATE));
+          Date date = newDate(task.getDueDate());
           assertEquals(date.getMinutes(), 30);
           assertEquals(date.getHours(), 12);
       }
@@ -173,7 +173,7 @@ public class TitleParserTest extends DatabaseTestCase {
         String title = "Jog today";
         task.setValue(Task.TITLE, title);
         TaskService.createWithValues(task, null, title);
-        Date date = newDate(task.getValue(Task.DUE_DATE));
+        Date date = newDate(task.getDueDate());
         assertEquals(date.getDay()+1, today.get(Calendar.DAY_OF_WEEK));
         //Calendar starts 1-6, date.getDay() starts at 0
 
@@ -181,7 +181,7 @@ public class TitleParserTest extends DatabaseTestCase {
         title = "Jog tomorrow";
         task.setValue(Task.TITLE, title);
         TaskService.createWithValues(task, null, title);
-        date = newDate(task.getValue(Task.DUE_DATE));
+        date = newDate(task.getDueDate());
         assertEquals((date.getDay()+1) % 7, (today.get(Calendar.DAY_OF_WEEK)+1) % 7);
 
         String[] days = {
@@ -208,14 +208,14 @@ public class TitleParserTest extends DatabaseTestCase {
             title = "Jog "+ days[i];
             task.setValue(Task.TITLE, title);
             TaskService.createWithValues(task, null, title);
-            date = newDate(task.getValue(Task.DUE_DATE));
+            date = newDate(task.getDueDate());
             assertEquals(date.getDay(), i);
 
             task = new Task();
             title = "Jog "+ abrevDays[i];
             task.setValue(Task.TITLE, title);
             TaskService.createWithValues(task, null, title);
-            date = newDate(task.getValue(Task.DUE_DATE));
+            date = newDate(task.getDueDate());
             assertEquals(date.getDay(), i);
         }
 
@@ -239,14 +239,14 @@ public class TitleParserTest extends DatabaseTestCase {
             String title = "Jog " + acceptedString;
             task.setValue(Task.TITLE, title); //test at end of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_LEAST);
+            assertEquals((int)task.getImportance(), Task.IMPORTANCE_LEAST);
         }
         for (String acceptedString:acceptedStrings){
             task = new Task();
             String title = acceptedString + " jog";
             task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance.
             TaskService.createWithValues(task, null, title);
-            assertNotSame(task.getValue(Task.IMPORTANCE),Task.IMPORTANCE_LEAST);
+            assertNotSame(task.getImportance(),Task.IMPORTANCE_LEAST);
         }
     }
 
@@ -267,23 +267,23 @@ public class TitleParserTest extends DatabaseTestCase {
             task = new Task();
             task.setValue(Task.TITLE, "Jog " + acceptedStringAtEnd); //test at end of task. should set importance.
             taskService.save(task);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_SHOULD_DO);
+            assertEquals((int)task.getImportance(), Task.IMPORTANCE_SHOULD_DO);
         }
         for (String acceptedStringAtEnd:acceptedStringsAtEnd){
             task = new Task();
             task.setValue(Task.TITLE, acceptedStringAtEnd + " jog"); //test at beginning of task. should not set importance.
             taskService.save(task);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_SHOULD_DO);
+            assertEquals((int)task.getImportance(), Task.IMPORTANCE_SHOULD_DO);
         }
         for (String acceptedStringAnywhere:acceptedStringsAnywhere){
             task = new Task();
             task.setValue(Task.TITLE, "Jog " + acceptedStringAnywhere); //test at end of task. should set importance.
             taskService.save(task);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_SHOULD_DO);
+            assertEquals((int)task.getImportance(), Task.IMPORTANCE_SHOULD_DO);
 
             task.setValue(Task.TITLE, acceptedStringAnywhere + " jog"); //test at beginning of task. should set importance.
             taskService.save(task);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_SHOULD_DO);
+            assertEquals((int)task.getImportance(), Task.IMPORTANCE_SHOULD_DO);
         }
     }
 
@@ -305,25 +305,25 @@ public class TitleParserTest extends DatabaseTestCase {
             String title = "Jog " + acceptedStringAtEnd;
             task.setValue(Task.TITLE, title); //test at end of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_MUST_DO);
+            assertEquals((int)task.getImportance(), Task.IMPORTANCE_MUST_DO);
 
             task = new Task();
             title = acceptedStringAtEnd + " jog";
             task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance.
             TaskService.createWithValues(task, null, title);
-            assertNotSame(task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_MUST_DO);
+            assertNotSame(task.getImportance(), Task.IMPORTANCE_MUST_DO);
         }
         for (String acceptedStringAnywhere:acceptedStringsAnywhere){
             task = new Task();
             String title = "Jog " + acceptedStringAnywhere;
             task.setValue(Task.TITLE, title); //test at end of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_MUST_DO);
+            assertEquals((int)task.getImportance(), Task.IMPORTANCE_MUST_DO);
 
             title = acceptedStringAnywhere + " jog";
             task.setValue(Task.TITLE, title); //test at beginning of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_MUST_DO);
+            assertEquals((int)task.getImportance(), Task.IMPORTANCE_MUST_DO);
         }
     }
 
@@ -348,25 +348,25 @@ public class TitleParserTest extends DatabaseTestCase {
             String title = "Jog " + acceptedStringAtEnd;
             task.setValue(Task.TITLE, title); //test at end of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_DO_OR_DIE);
+            assertEquals((int)task.getImportance(), Task.IMPORTANCE_DO_OR_DIE);
 
             task = new Task();
             title = acceptedStringAtEnd + " jog";
             task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance.
             TaskService.createWithValues(task, null, title);
-            assertNotSame(task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_DO_OR_DIE);
+            assertNotSame(task.getImportance(), Task.IMPORTANCE_DO_OR_DIE);
         }
         for (String acceptedStringAnywhere:acceptedStringsAnywhere){
             task = new Task();
             String title = "Jog " + acceptedStringAnywhere;
             task.setValue(Task.TITLE, title); //test at end of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_DO_OR_DIE);
+            assertEquals((int)task.getImportance(), Task.IMPORTANCE_DO_OR_DIE);
 
             title = acceptedStringAnywhere + " jog";
             task.setValue(Task.TITLE, title); //test at beginning of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_DO_OR_DIE);
+            assertEquals((int)task.getImportance(), Task.IMPORTANCE_DO_OR_DIE);
         }
     }
 
@@ -385,14 +385,14 @@ public class TitleParserTest extends DatabaseTestCase {
         RRule rrule = new RRule();
         rrule.setFreq(Frequency.DAILY);
         rrule.setInterval(1);
-        assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+        assertEquals(task.getRecurrence(), rrule.toIcal());
         assertFalse(task.hasDueTime());
         assertFalse(task.hasDueDate());
 
         title = "Jog every day";
         task.setValue(Task.TITLE, title);
         TaskService.createWithValues(task, null, title);
-        assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+        assertEquals(task.getRecurrence(), rrule.toIcal());
         assertFalse(task.hasDueTime());
         assertFalse(task.hasDueDate());
 
@@ -401,7 +401,7 @@ public class TitleParserTest extends DatabaseTestCase {
             task.setValue(Task.TITLE, title);
             rrule.setInterval(i);
             TaskService.createWithValues(task, null, title);
-            assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+            assertEquals(task.getRecurrence(), rrule.toIcal());
             assertFalse(task.hasDueTime());
             assertFalse(task.hasDueDate());
             task = new Task();
@@ -419,14 +419,14 @@ public class TitleParserTest extends DatabaseTestCase {
         RRule rrule = new RRule();
         rrule.setFreq(Frequency.WEEKLY);
         rrule.setInterval(1);
-        assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+        assertEquals(task.getRecurrence(), rrule.toIcal());
         assertFalse(task.hasDueTime());
         assertFalse(task.hasDueDate());
 
         title = "Jog every week";
         task.setValue(Task.TITLE, title);
         TaskService.createWithValues(task, null, title);
-        assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+        assertEquals(task.getRecurrence(), rrule.toIcal());
         assertFalse(task.hasDueTime());
         assertFalse(task.hasDueDate());
 
@@ -435,7 +435,7 @@ public class TitleParserTest extends DatabaseTestCase {
             task.setValue(Task.TITLE, title);
             rrule.setInterval(i);
             TaskService.createWithValues(task, null, title);
-            assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+            assertEquals(task.getRecurrence(), rrule.toIcal());
             assertFalse(task.hasDueTime());
             assertFalse(task.hasDueDate());
             task = new Task();
@@ -451,14 +451,14 @@ public class TitleParserTest extends DatabaseTestCase {
         RRule rrule = new RRule();
         rrule.setFreq(Frequency.MONTHLY);
         rrule.setInterval(1);
-        assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+        assertEquals(task.getRecurrence(), rrule.toIcal());
         assertFalse(task.hasDueTime());
         assertFalse(task.hasDueDate());
 
         title = "Jog every month";
         task.setValue(Task.TITLE, title);
         TaskService.createWithValues(task, null, title);
-        assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+        assertEquals(task.getRecurrence(), rrule.toIcal());
         assertFalse(task.hasDueTime());
         assertFalse(task.hasDueDate());
 
@@ -467,7 +467,7 @@ public class TitleParserTest extends DatabaseTestCase {
             task.setValue(Task.TITLE, title);
             rrule.setInterval(i);
             TaskService.createWithValues(task, null, title);
-            assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+            assertEquals(task.getRecurrence(), rrule.toIcal());
             assertFalse(task.hasDueTime());
             assertFalse(task.hasDueDate());
             task = new Task();
@@ -482,7 +482,7 @@ public class TitleParserTest extends DatabaseTestCase {
         RRule rrule = new RRule();
         rrule.setFreq(Frequency.DAILY);
         rrule.setInterval(1);
-        assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+        assertEquals(task.getRecurrence(), rrule.toIcal());
         assertTrue(task.hasDueDate());
 
         task.clearValue(Task.ID);
@@ -490,7 +490,7 @@ public class TitleParserTest extends DatabaseTestCase {
         title = "Jog every day starting from today";
         task.setValue(Task.TITLE, title);
         TaskService.createWithValues(task, null, title);
-        assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+        assertEquals(task.getRecurrence(), rrule.toIcal());
         assertTrue(task.hasDueDate());
 
         for (int i = 1; i <= 12; i++){
@@ -498,7 +498,7 @@ public class TitleParserTest extends DatabaseTestCase {
             task.setValue(Task.TITLE, title);
             rrule.setInterval(i);
             TaskService.createWithValues(task, null, title);
-            assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+            assertEquals(task.getRecurrence(), rrule.toIcal());
             assertTrue(task.hasDueDate());
             task = new Task();
         }
@@ -512,7 +512,7 @@ public class TitleParserTest extends DatabaseTestCase {
         RRule rrule = new RRule();
         rrule.setFreq(Frequency.WEEKLY);
         rrule.setInterval(1);
-        assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+        assertEquals(task.getRecurrence(), rrule.toIcal());
         assertTrue(task.hasDueDate());
 
         task.clearValue(Task.ID);
@@ -520,7 +520,7 @@ public class TitleParserTest extends DatabaseTestCase {
         title = "Jog every week starting from today";
         task.setValue(Task.TITLE, title);
         TaskService.createWithValues(task, null, title);
-        assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+        assertEquals(task.getRecurrence(), rrule.toIcal());
         assertTrue(task.hasDueDate());
 
         for (int i = 1; i <= 12; i++){
@@ -528,7 +528,7 @@ public class TitleParserTest extends DatabaseTestCase {
             task.setValue(Task.TITLE, title);
             rrule.setInterval(i);
             TaskService.createWithValues(task, null, title);
-            assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
+            assertEquals(task.getRecurrence(), rrule.toIcal());
             assertTrue(task.hasDueDate());
             task = new Task();
         }

astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java

@@ -40,7 +40,7 @@ public class SubtasksTestCase extends DatabaseTestCase {
     protected void expectParentAndPosition(Task task, Task parent, int positionInParent) {
         String parentId = (parent == null ? "-1" : parent.getUuid());
         Node n = updater.findNodeForTask(task.getUuid());
-        assertNotNull("No node found for task " + task.getValue(Task.TITLE), n);
+        assertNotNull("No node found for task " + task.getTitle(), n);
         assertEquals("Parent mismatch", parentId, n.parent.uuid);
         assertEquals("Position mismatch", positionInParent, n.parent.children.indexOf(n));
     }

astrid/src/instrumentTest/java/com/todoroo/astrid/sync/SyncModelTest.java

@@ -8,12 +8,12 @@ public class SyncModelTest extends NewSyncTestCase {
 	
 	public void testCreateTaskMakesUuid() {
 		Task task = createTask();
-		assertFalse(RemoteModel.NO_UUID.equals(task.getValue(Task.UUID)));
+		assertFalse(RemoteModel.NO_UUID.equals(task.getUUID()));
 	}
 
 	public void testCreateTagMakesUuid() {
 		TagData tag = createTagData();
-		assertFalse(RemoteModel.NO_UUID.equals(tag.getValue(TagData.UUID)));	
+		assertFalse(RemoteModel.NO_UUID.equals(tag.getUUID()));	
 	}
 
 }

astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java

@@ -76,7 +76,7 @@ public class TagCommentsFragment extends CommentsFragment {
         userActivity.setValue(UserActivity.ACTION, UserActivity.ACTION_TAG_COMMENT);
         userActivity.setValue(UserActivity.USER_UUID, Task.USER_ID_SELF);
         userActivity.setValue(UserActivity.TARGET_ID, tagData.getUuid());
-        userActivity.setValue(UserActivity.TARGET_NAME, tagData.getValue(TagData.NAME));
+        userActivity.setValue(UserActivity.TARGET_NAME, tagData.getName());
         userActivity.setValue(UserActivity.CREATED_AT, DateUtilities.now());
         return userActivity;
     }

astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java

@@ -156,7 +156,7 @@ public class TagSettingsActivity extends ActionBarActivity {
     }
 
     private void saveSettings() {
-        String oldName = tagData.getValue(TagData.NAME);
+        String oldName = tagData.getName();
         String newName = tagName.getText().toString().trim();
 
         if (TextUtils.isEmpty(newName)) {
@@ -194,7 +194,7 @@ public class TagSettingsActivity extends ActionBarActivity {
         imm.hideSoftInputFromWindow(tagName.getWindowToken(), 0);
 
         tagDataService.save(tagData);
-        tagMetadataDao.synchronizeMembers(tagData, tagData.getValue(TagData.MEMBERS), tagData.getUuid(), members);
+        tagMetadataDao.synchronizeMembers(tagData, tagData.getMembers(), tagData.getUuid(), members);
 
         if (isNewTag) {
             setResult(RESULT_OK, new Intent().putExtra(TOKEN_NEW_FILTER,
@@ -233,7 +233,7 @@ public class TagSettingsActivity extends ActionBarActivity {
     }
 
     private void refreshSettingsPage() {
-        tagName.setText(tagData.getValue(TagData.NAME));
+        tagName.setText(tagData.getName());
         ActionBar ab = getSupportActionBar();
         if (ab != null) {
             if (isNewTag) {

astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java

@@ -181,7 +181,7 @@ public class TagViewFragment extends TaskListFragment {
         int count = taskAdapter.getCursor().getCount();
 
         if(tagData != null && sortFlags <= SortHelper.FLAG_REVERSE_SORT &&
-                count != tagData.getValue(TagData.TASK_COUNT)) {
+                count != tagData.getTaskCount()) {
             tagData.setValue(TagData.TASK_COUNT, count);
             tagDataService.save(tagData);
         }
@@ -196,7 +196,7 @@ public class TagViewFragment extends TaskListFragment {
             return;
         }
         if (tagData != null) {
-            long lastAutosync = tagData.getValue(TagData.LAST_AUTOSYNC);
+            long lastAutosync = tagData.getLastAutosync();
             if(DateUtilities.now() - lastAutosync > AUTOSYNC_INTERVAL) {
                 tagData.setValue(TagData.LAST_AUTOSYNC, DateUtilities.now());
                 tagDataDao.saveExisting(tagData);
@@ -212,7 +212,7 @@ public class TagViewFragment extends TaskListFragment {
             if(!intent.hasExtra("tag_id")) {
                 return;
             }
-            if(tagData == null || !tagData.getValue(TagData.UUID).equals(intent.getStringExtra("tag_id"))) {
+            if(tagData == null || !tagData.getUUID().equals(intent.getStringExtra("tag_id"))) {
                 return;
             }
 
@@ -225,7 +225,7 @@ public class TagViewFragment extends TaskListFragment {
 
             NotificationManager nm = new AndroidNotificationManager(ContextManager.getContext());
             try {
-                nm.cancel(Integer.parseInt(tagData.getValue(TagData.UUID)));
+                nm.cancel(Integer.parseInt(tagData.getUUID()));
             } catch (NumberFormatException e) {
                 // Eh
             }

astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -574,7 +574,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     protected void loadItem(Intent intent) {
         if (model != null) {
             // came from bundle
-            setIsNewTask(model.getValue(Task.TITLE).length() == 0);
+            setIsNewTask(model.getTitle().length() == 0);
             return;
         }
 
@@ -583,7 +583,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             model = taskService.fetchById(idParam, Task.PROPERTIES);
 
             if (model != null && model.containsNonNullValue(Task.UUID)) {
-                uuid = model.getValue(Task.UUID);
+                uuid = model.getUUID();
             }
         }
 
@@ -602,13 +602,13 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             getActivity().getIntent().putExtra(TOKEN_ID, model.getId());
         }
 
-        if (model.getValue(Task.TITLE).length() == 0) {
+        if (model.getTitle().length() == 0) {
 
             // set deletion date until task gets a title
             model.setValue(Task.DELETION_DATE, DateUtilities.now());
         }
 
-        setIsNewTask(model.getValue(Task.TITLE).length() == 0);
+        setIsNewTask(model.getTitle().length() == 0);
 
         if (model == null) {
             exceptionService.reportError("task-edit-no-task",
@@ -692,7 +692,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         if (!onPause) {
             boolean taskEditActivity = (getActivity() instanceof TaskEditActivity);
             boolean showRepeatAlert = model.getTransitory(TaskService.TRANS_REPEAT_CHANGED) != null
-                    && !TextUtils.isEmpty(model.getValue(Task.RECURRENCE));
+                    && !TextUtils.isEmpty(model.getRecurrence());
 
             if (taskEditActivity) {
                 Intent data = new Intent();
@@ -782,7 +782,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         shouldSaveState = false;
 
         // abandon editing in this case
-        if (title.getText().length() == 0 || TextUtils.isEmpty(model.getValue(Task.TITLE))) {
+        if (title.getText().length() == 0 || TextUtils.isEmpty(model.getTitle())) {
             if (isNewTask) {
                 TimerPlugin.updateTimer(getActivity(), model, false);
                 taskService.delete(model);

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

@@ -828,7 +828,7 @@ public class TaskListFragment extends ListFragment implements OnSortSelectedList
     private TodorooCursor<Task> constructCursor() {
         String tagName = null;
         if (getActiveTagData() != null) {
-            tagName = getActiveTagData().getValue(TagData.NAME);
+            tagName = getActiveTagData().getName();
         }
 
         Criterion tagsJoinCriterion = Criterion.and(
@@ -911,7 +911,7 @@ public class TaskListFragment extends ListFragment implements OnSortSelectedList
         Task task = ((ViewHolder) adapterInfo.targetView.getTag()).task;
 
         int id = (int) task.getId();
-        menu.setHeaderTitle(task.getValue(Task.TITLE));
+        menu.setHeaderTitle(task.getTitle());
 
         if (task.isDeleted()) {
             menu.add(id, CONTEXT_MENU_UNDELETE_TASK_ID, Menu.NONE,

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

@@ -431,10 +431,10 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
         // name
         final TextView nameView = viewHolder.nameView; {
-            String nameValue = task.getValue(Task.TITLE);
+            String nameValue = task.getTitle();
 
-            long hiddenUntil = task.getValue(Task.HIDE_UNTIL);
+            long hiddenUntil = task.getHideUntil();
-            if(task.getValue(Task.DELETION_DATE) > 0) {
+            if(task.getDeletionDate() > 0) {
                 nameValue = resources.getString(R.string.TAd_deletedFormat, nameValue);
             }
             if(hiddenUntil > DateUtilities.now()) {
@@ -454,7 +454,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             if(taskDetailLoader.containsKey(task.getId())) {
                 details = taskDetailLoader.get(task.getId()).toString();
             } else {
-                details = task.getValue(Task.DETAILS);
+                details = task.getDetails();
             }
             if(TextUtils.isEmpty(details) || DETAIL_SEPARATOR.equals(details) || task.isCompleted()) {
                 viewHolder.details1.setVisibility(View.GONE);
@@ -487,7 +487,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             }
         }
 
-        if(Math.abs(DateUtilities.now() - task.getValue(Task.MODIFICATION_DATE)) < 2000L) {
+        if(Math.abs(DateUtilities.now() - task.getModificationDate()) < 2000L) {
             mostRecentlyMade = task.getId();
         }
 
@@ -594,7 +594,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         String notes = null;
         Task t = taskService.fetchById(task.getId(), Task.NOTES);
         if (t != null) {
-            notes = t.getValue(Task.NOTES);
+            notes = t.getNotes();
         }
         if (TextUtils.isEmpty(notes)) {
             return;
@@ -704,7 +704,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                         // even if we are up to date, randomly load a fraction
                         if(random.nextFloat() < 0.1) {
                             taskDetailLoader.put(task.getId(),
-                                    new StringBuilder(task.getValue(Task.DETAILS)));
+                                    new StringBuilder(task.getDetails()));
                             requestNewDetails(task);
                             if(Constants.DEBUG) {
                                 System.err.println("Refreshing details: " + task.getId()); //$NON-NLS-1$
@@ -713,8 +713,8 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                         continue;
                     } else if(Constants.DEBUG) {
                         System.err.println("Forced loading of details: " + task.getId() + //$NON-NLS-1$
-                                "\n  details: " + newDate(task.getValue(Task.DETAILS_DATE)) + //$NON-NLS-1$
+                                "\n  details: " + newDate(task.getDetailsDate()) + //$NON-NLS-1$
-                                "\n  modified: " + newDate(task.getValue(Task.MODIFICATION_DATE))); //$NON-NLS-1$
+                                "\n  modified: " + newDate(task.getModificationDate())); //$NON-NLS-1$
                     }
                     addTaskToLoadingArray(task);
 
@@ -743,8 +743,8 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         }
 
         private boolean detailsAreRecentAndUpToDate(Task task) {
-            return task.getValue(Task.DETAILS_DATE) >= task.getValue(Task.MODIFICATION_DATE) &&
+            return task.getDetailsDate() >= task.getModificationDate() &&
-            !TextUtils.isEmpty(task.getValue(Task.DETAILS));
+            !TextUtils.isEmpty(task.getDetails());
         }
 
         private void addTaskToLoadingArray(Task task) {
@@ -1042,12 +1042,12 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             checkBoxView.setChecked(completed);
             checkBoxView.setEnabled(true);
 
-            int value = task.getValue(Task.IMPORTANCE);
+            int value = task.getImportance();
             if (value >= IMPORTANCE_RESOURCES.length) {
                 value = IMPORTANCE_RESOURCES.length - 1;
             }
             Drawable[] boxes;
-            if (!TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) {
+            if (!TextUtils.isEmpty(task.getRecurrence())) {
                 boxes = completed ? IMPORTANCE_REPEAT_DRAWABLES_CHECKED : IMPORTANCE_REPEAT_DRAWABLES;
             } else {
                 boxes = completed ? IMPORTANCE_DRAWABLES_CHECKED : IMPORTANCE_DRAWABLES;
@@ -1069,7 +1069,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             Activity activity = fragment.getActivity();
             if (activity != null) {
                 if(!task.isCompleted() && task.hasDueDate()) {
-                    long dueDate = task.getValue(Task.DUE_DATE);
+                    long dueDate = task.getDueDate();
                     if(task.isOverdue()) {
                         dueDateView.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemDueDate_Overdue);
                     } else {
@@ -1080,7 +1080,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                     dueDateTextWidth = paint.measureText(dateValue);
                     dueDateView.setVisibility(View.VISIBLE);
                 } else if(task.isCompleted()) {
-                    String dateValue = formatDate(task.getValue(Task.COMPLETION_DATE));
+                    String dateValue = formatDate(task.getCompletionDate());
                     dueDateView.setText(resources.getString(R.string.TAd_completed, dateValue));
                     dueDateView.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemDueDate_Completed);
                     dueDateTextWidth = paint.measureText(dateValue);

astrid/src/main/java/com/todoroo/astrid/adapter/UpdateAdapter.java

@@ -160,7 +160,7 @@ public class UpdateAdapter extends CursorAdapter {
                 updateBitmap = activity.getPictureBitmap(UserActivity.PICTURE);
             }
             setupImagePopupForCommentView(view, commentPictureView, pictureThumb, updateBitmap,
-                    activity.getValue(UserActivity.MESSAGE), fragment);
+                    activity.getMessage(), fragment);
         }
 
         // name
@@ -173,7 +173,7 @@ public class UpdateAdapter extends CursorAdapter {
 
         // date
         final TextView date = (TextView)view.findViewById(R.id.date); {
-            CharSequence dateString = DateUtils.getRelativeTimeSpanString(activity.getValue(UserActivity.CREATED_AT),
+            CharSequence dateString = DateUtils.getRelativeTimeSpanString(activity.getCreatedAt(),
                     DateUtilities.now(), DateUtils.MINUTE_IN_MILLIS,
                     DateUtils.FORMAT_ABBREV_RELATIVE);
             date.setText(dateString);
@@ -220,7 +220,7 @@ public class UpdateAdapter extends CursorAdapter {
     }
 
     public static Spanned getUpdateComment(UserActivity activity) {
-        String message = activity.getValue(UserActivity.MESSAGE);
+        String message = activity.getMessage();
         return Html.fromHtml(message);
     }
 }

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java

@@ -180,7 +180,7 @@ public class AlarmService {
             return;
         }
 
-        long taskId = alarm.getValue(Metadata.TASK);
+        long taskId = alarm.getTask();
 
         Context context = ContextManager.getContext();
         AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);

astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java

@@ -298,10 +298,10 @@ public class TasksXmlImporter {
             // Construct the TagData from Metadata
             // Fix for failed backup, Version before 4.6.10
             if (format == 2) {
-                String key = metadata.getValue(Metadata.KEY);
+                String key = metadata.getKey();
                 String name = metadata.getValue(Metadata.VALUE1);
                 String uuid = metadata.getValue(Metadata.VALUE2);
-                long deletionDate = metadata.getValue(Metadata.DELETION_DATE);
+                long deletionDate = metadata.getDeletionDate();
                 // UUID is uniquely for every TagData, so we don't need to test the name
                 TodorooCursor<TagData> cursor = tagdataService.query(Query.select(TagData.ID).
                         where(TagData.UUID.eq(uuid)));
@@ -486,7 +486,7 @@ public class TasksXmlImporter {
 
         private void saveTags() {
             if(currentTask != null && tags.size() > 0) {
-                TagService.getInstance().synchronizeTags(currentTask.getId(), currentTask.getValue(Task.UUID), tags);
+                TagService.getInstance().synchronizeTags(currentTask.getId(), currentTask.getUUID(), tags);
             }
             tags.clear();
         }
@@ -536,8 +536,8 @@ public class TasksXmlImporter {
             }
 
             if(upgradeNotes != null) {
-                if(task.containsValue(Task.NOTES) && task.getValue(Task.NOTES).length() > 0) {
+                if(task.containsValue(Task.NOTES) && task.getNotes().length() > 0) {
-                    task.setValue(Task.NOTES, task.getValue(Task.NOTES) + "\n" + upgradeNotes);
+                    task.setValue(Task.NOTES, task.getNotes() + "\n" + upgradeNotes);
                 } else {
                     task.setValue(Task.NOTES, upgradeNotes);
                 }

astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java

@@ -43,7 +43,7 @@ public class LinkActionExposer {
             return null;
         }
 
-        Spannable titleSpan = Spannable.Factory.getInstance().newSpannable(task.getValue(Task.TITLE));
+        Spannable titleSpan = Spannable.Factory.getInstance().newSpannable(task.getTitle());
         Linkify.addLinks(titleSpan, Linkify.ALL);
 
         URLSpan[] urlSpans = titleSpan.getSpans(0, titleSpan.length(), URLSpan.class);

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

@@ -127,7 +127,7 @@ public class MetadataDao extends DatabaseDao<Metadata> {
         boolean state = super.persist(item);
         if(Preferences.getBoolean(AstridPreferences.P_FIRST_LIST, true)) {
             if (state && item.containsNonNullValue(Metadata.KEY) &&
-                    item.getValue(Metadata.KEY).equals(TaskToTagMetadata.KEY)) {
+                    item.getKey().equals(TaskToTagMetadata.KEY)) {
                 Preferences.setBoolean(AstridPreferences.P_FIRST_LIST, false);
             }
         }

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

@@ -25,7 +25,7 @@ public class RemoteModelDao<RTYPE extends RemoteModel> extends DatabaseDao<RTYPE
 
     @Override
     public boolean createNew(RTYPE item) {
-        if (!item.containsValue(RemoteModel.UUID_PROPERTY) || RemoteModel.isUuidEmpty(item.getValue(RemoteModel.UUID_PROPERTY))) {
+        if (!item.containsValue(RemoteModel.UUID_PROPERTY) || RemoteModel.isUuidEmpty(item.getUuidProperty())) {
             item.setValue(RemoteModel.UUID_PROPERTY, UUIDHelper.newUUID());
         }
         return super.createNew(item);

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

@@ -173,7 +173,7 @@ public class TaskDao extends RemoteModelDao<Task> {
 
     public boolean handleSQLiteConstraintException(Task task) {
         TodorooCursor<Task> cursor = query(Query.select(Task.ID).where(
-                Task.UUID.eq(task.getValue(Task.UUID))));
+                Task.UUID.eq(task.getUUID())));
         if (cursor.getCount() > 0) {
             cursor.moveToFirst();
             task.setId(cursor.get(Task.ID));
@@ -273,7 +273,7 @@ public class TaskDao extends RemoteModelDao<Task> {
         try {
             saveExisting(item);
         } catch (SQLiteConstraintException e) {
-            String uuid = item.getValue(Task.UUID);
+            String uuid = item.getUUID();
             TodorooCursor<Task> tasksWithUUID = query(Query.select(
                     SQL_CONSTRAINT_MERGE_PROPERTIES).where(
                     Task.UUID.eq(uuid)));
@@ -317,8 +317,8 @@ public class TaskDao extends RemoteModelDao<Task> {
             }
         }
         if (!match) {
-            if (existing.getValue(Task.CREATION_DATE).equals(newConflict.getValue(Task.CREATION_DATE))) {
+            if (existing.getCreationDate().equals(newConflict.getCreationDate())) {
-                newConflict.setValue(Task.CREATION_DATE, newConflict.getValue(Task.CREATION_DATE) + 1000L);
+                newConflict.setValue(Task.CREATION_DATE, newConflict.getCreationDate() + 1000L);
             }
             newConflict.clearValue(Task.UUID);
             saveExisting(newConflict);

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

@@ -116,7 +116,7 @@ public class FilesControlSet extends PopupControlSet {
         for (int i = 0; i < files.size(); i++) {
             TaskAttachment m = files.get(i);
             if (m.containsNonNullValue(TaskAttachment.FILE_PATH)) {
-                File f = new File(m.getValue(TaskAttachment.FILE_PATH));
+                File f = new File(m.getFilePath());
                 if (!f.exists()) {
                     m.setValue(TaskAttachment.FILE_PATH, ""); //$NON-NLS-1$
                     if (m.containsNonNullValue(TaskAttachment.URL)) { // We're ok, just the local file was deleted
@@ -170,7 +170,7 @@ public class FilesControlSet extends PopupControlSet {
                             new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface d, int which) {
-                            if (RemoteModel.isValidUuid(m.getValue(TaskAttachment.UUID))) {
+                            if (RemoteModel.isValidUuid(m.getUUID())) {
                                 m.setValue(TaskAttachment.DELETED_AT, DateUtilities.now());
                                 taskAttachmentDao.saveExisting(m);
                             } else {
@@ -178,7 +178,7 @@ public class FilesControlSet extends PopupControlSet {
                             }
 
                             if (m.containsNonNullValue(TaskAttachment.FILE_PATH)) {
-                                File f = new File(m.getValue(TaskAttachment.FILE_PATH));
+                                File f = new File(m.getFilePath());
                                 f.delete();
                             }
                             files.remove(m);
@@ -192,11 +192,11 @@ public class FilesControlSet extends PopupControlSet {
     }
 
     private void showFile(final TaskAttachment m) {
-        final String fileType = m.containsNonNullValue(TaskAttachment.CONTENT_TYPE) ? m.getValue(TaskAttachment.CONTENT_TYPE) : TaskAttachment.FILE_TYPE_OTHER;
+        final String fileType = m.containsNonNullValue(TaskAttachment.CONTENT_TYPE) ? m.getContentType() : TaskAttachment.FILE_TYPE_OTHER;
-        final String filePath = m.getValue(TaskAttachment.FILE_PATH);
+        final String filePath = m.getFilePath();
 
         if (fileType.startsWith(TaskAttachment.FILE_TYPE_AUDIO)) {
-            RecognizerApi.play(activity, m.getValue(TaskAttachment.FILE_PATH), new PlaybackExceptionHandler() {
+            RecognizerApi.play(activity, m.getFilePath(), new PlaybackExceptionHandler() {
                 @Override
                 public void playbackFailed(String file) {
                     showFromIntent(filePath, fileType);
@@ -290,7 +290,7 @@ public class FilesControlSet extends PopupControlSet {
         nameView.setTextColor(themeColor);
         TextView typeView = (TextView) row.findViewById(R.id.file_type);
         String name = getNameString(m);
-        String type = getTypeString(m.getValue(TaskAttachment.NAME));
+        String type = getTypeString(m.getName());
         nameView.setText(name);
 
         if (TextUtils.isEmpty(type)) {
@@ -303,7 +303,7 @@ public class FilesControlSet extends PopupControlSet {
     }
 
     private String getNameString(TaskAttachment metadata) {
-        String name = metadata.getValue(TaskAttachment.NAME);
+        String name = metadata.getName();
         int extension = name.lastIndexOf('.');
         if (extension < 0) {
             return name;

astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java

@@ -194,14 +194,14 @@ public class CalendarReminderActivity extends Activity {
     private void listExists(final TagData tag) {
         DialogUtilities.okCancelCustomDialog(this,
             getString(R.string.CRA_list_exists_title),
-            getString(R.string.CRA_list_exists_body, tag.getValue(TagData.NAME)),
+            getString(R.string.CRA_list_exists_body, tag.getName()),
             R.string.CRA_create_new,
             R.string.CRA_use_existing,
             0,
             new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-                    createNewList(tag.getValue(TagData.NAME) + " "
+                    createNewList(tag.getName() + " "
                             + DateUtilities.getDateStringHideYear(newDate(startTime)));
                 }
             },

astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java

@@ -122,7 +122,7 @@ public class GCalControlSet extends PopupControlSet {
                 hasEvent = true;
             } catch (Exception e) {
                 exceptionService.reportError("unable-to-parse-calendar: " +  //$NON-NLS-1$
-                        model.getValue(Task.CALENDAR_URI), e);
+                        model.getCalendarURI(), e);
             }
         } else {
             hasEvent = false;
@@ -179,10 +179,10 @@ public class GCalControlSet extends PopupControlSet {
                 // check if we need to update the item
                 ContentValues setValues = task.getSetValues();
                 if(setValues.containsKey(Task.TITLE.name)) {
-                    updateValues.put("title", task.getValue(Task.TITLE));
+                    updateValues.put("title", task.getTitle());
                 }
                 if(setValues.containsKey(Task.NOTES.name)) {
-                    updateValues.put("description", task.getValue(Task.NOTES));
+                    updateValues.put("description", task.getNotes());
                 }
                 if(setValues.containsKey(Task.DUE_DATE.name) || setValues.containsKey(Task.ESTIMATED_SECONDS.name)) {
                     GCalHelper.createStartAndEndDate(task, updateValues);
@@ -192,7 +192,7 @@ public class GCalControlSet extends PopupControlSet {
                 cr.update(calendarUri, updateValues, null, null);
             } catch (Exception e) {
                 exceptionService.reportError("unable-to-update-calendar: " +  //$NON-NLS-1$
-                        task.getValue(Task.CALENDAR_URI), e);
+                        task.getCalendarURI(), e);
             }
         }
     }
@@ -244,7 +244,7 @@ public class GCalControlSet extends PopupControlSet {
             }
         } else {
             int index = calendars.defaultIndex;
-            if (!TextUtils.isEmpty(model.getValue(Task.CALENDAR_URI))) {
+            if (!TextUtils.isEmpty(model.getCalendarURI())) {
                 calendar.setText(R.string.gcal_TEA_has_event);
             } else if (index >= 0 && index < calendars.calendars.length) {
                 calendar.setText(calendars.calendars[index]);

astrid/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java

@@ -33,14 +33,14 @@ public class GCalHelper {
 
     public static String getTaskEventUri(Task task) {
         String uri;
-        if (!TextUtils.isEmpty(task.getValue(Task.CALENDAR_URI))) {
+        if (!TextUtils.isEmpty(task.getCalendarURI())) {
-            uri = task.getValue(Task.CALENDAR_URI);
+            uri = task.getCalendarURI();
         } else {
             task = PluginServices.getTaskService().fetchById(task.getId(), Task.CALENDAR_URI);
             if(task == null) {
                 return null;
             }
-            uri = task.getValue(Task.CALENDAR_URI);
+            uri = task.getCalendarURI();
         }
 
         return uri;
@@ -78,8 +78,8 @@ public class GCalHelper {
 
         try{
             Uri uri = Calendars.getCalendarContentUri(Calendars.CALENDAR_CONTENT_EVENTS);
-            values.put("title", task.getValue(Task.TITLE));
+            values.put("title", task.getTitle());
-            values.put("description", task.getValue(Task.NOTES));
+            values.put("description", task.getNotes());
             values.put("hasAlarm", 0);
             if (AndroidUtilities.getSdkVersion() < 14) {
                 values.put("transparency", 0);
@@ -145,13 +145,13 @@ public class GCalHelper {
         boolean eventDeleted = false;
         String uri;
         if(task.containsNonNullValue(Task.CALENDAR_URI)) {
-            uri = task.getValue(Task.CALENDAR_URI);
+            uri = task.getCalendarURI();
         } else {
             task = PluginServices.getTaskService().fetchById(task.getId(), Task.CALENDAR_URI);
             if(task == null) {
                 return false;
             }
-            uri = task.getValue(Task.CALENDAR_URI);
+            uri = task.getCalendarURI();
         }
 
         if(!TextUtils.isEmpty(uri)) {
@@ -182,13 +182,13 @@ public class GCalHelper {
     }
 
     static void createStartAndEndDate(Task task, ContentValues values) {
-        long dueDate = task.getValue(Task.DUE_DATE);
+        long dueDate = task.getDueDate();
         long tzCorrectedDueDate = dueDate + TimeZone.getDefault().getOffset(dueDate);
         long tzCorrectedDueDateNow = DateUtilities.now() + TimeZone.getDefault().getOffset(DateUtilities.now());
         // FIXME: doesnt respect timezones, see story 17443653
         if(task.hasDueDate()) {
             if(task.hasDueTime()) {
-                long estimatedTime = task.getValue(Task.ESTIMATED_SECONDS)  * 1000;
+                long estimatedTime = task.getEstimatedSeconds()  * 1000;
                 if(estimatedTime <= 0) {
                     estimatedTime = DEFAULT_CAL_TIME;
                 }

astrid/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java

@@ -36,14 +36,14 @@ public class GCalTaskCompleteListener extends BroadcastReceiver {
             return;
         }
 
-        String calendarUri = task.getValue(Task.CALENDAR_URI);
+        String calendarUri = task.getCalendarURI();
         if(!TextUtils.isEmpty(calendarUri)) {
             try {
                 // change title of calendar event
                 ContentResolver cr = context.getContentResolver();
                 ContentValues values = new ContentValues();
                 values.put("title", context.getString(R.string.gcal_completed_title,
-                        task.getValue(Task.TITLE)));
+                        task.getTitle()));
                 cr.update(Uri.parse(calendarUri), values, null, null);
             } catch (Exception e) {
                 Log.d("astrid-gcal", "Error updating calendar entry", e); //$NON-NLS-1$ //$NON-NLS-2$

astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java

@@ -96,7 +96,7 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
         try {
             if (metadata.getCount() > 0) {
                 metadata.moveToFirst();
-                return (new Metadata(metadata).getValue(Metadata.TASK));
+                return (new Metadata(metadata).getTask());
             } else {
                 return AbstractModel.NO_ID;
             }

astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java

@@ -155,16 +155,16 @@ public class GtasksTaskListUpdater extends OrderedMetadataListUpdater<StoreObjec
                 Metadata curr = new Metadata();
                 for (metadata.moveToFirst(); !metadata.isAfterLast(); metadata.moveToNext()) {
                     curr.readFromCursor(metadata);
-                    if(alreadyChecked.contains(curr.getValue(Metadata.TASK))) {
+                    if(alreadyChecked.contains(curr.getTask())) {
                         continue;
                     }
 
                     curr.setValue(GtasksMetadata.INDENT, indentLevel);
                     curr.setValue(GtasksMetadata.ORDER, order.getAndIncrement());
                     metadataDao.saveExisting(curr);
-                    alreadyChecked.add(curr.getValue(Metadata.TASK));
+                    alreadyChecked.add(curr.getTask());
 
-                    orderAndIndentHelper(listId, order, curr.getValue(Metadata.TASK), indentLevel + 1, alreadyChecked);
+                    orderAndIndentHelper(listId, order, curr.getTask(), indentLevel + 1, alreadyChecked);
                 }
             }
         } finally {

astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java

@@ -186,7 +186,7 @@ public class GtasksSyncService {
         if (metadata.checkAndClearTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC)) {
             return;
         }
-        if (!metadata.getValue(Metadata.KEY).equals(GtasksMetadata.METADATA_KEY)) //Don't care about non-gtasks metadata
+        if (!metadata.getKey().equals(GtasksMetadata.METADATA_KEY)) //Don't care about non-gtasks metadata
         {
             return;
         }
@@ -255,7 +255,7 @@ public class GtasksSyncService {
         //creating a task which may end up being cancelled. Also don't sync new but already
         //deleted tasks
         if (newlyCreated &&
-                (!values.containsKey(Task.TITLE.name) || TextUtils.isEmpty(task.getValue(Task.TITLE)) || task.getValue(Task.DELETION_DATE) > 0)) {
+                (!values.containsKey(Task.TITLE.name) || TextUtils.isEmpty(task.getTitle()) || task.getDeletionDate() > 0)) {
             return;
         }
 
@@ -265,17 +265,17 @@ public class GtasksSyncService {
         }
 
         if (values.containsKey(Task.TITLE.name)) {
-            remoteModel.setTitle(task.getValue(Task.TITLE));
+            remoteModel.setTitle(task.getTitle());
         }
         if (values.containsKey(Task.NOTES.name)) {
-            remoteModel.setNotes(task.getValue(Task.NOTES));
+            remoteModel.setNotes(task.getNotes());
         }
         if (values.containsKey(Task.DUE_DATE.name) && task.hasDueDate()) {
-            remoteModel.setDue(GtasksApiUtilities.unixTimeToGtasksDueDate(task.getValue(Task.DUE_DATE)));
+            remoteModel.setDue(GtasksApiUtilities.unixTimeToGtasksDueDate(task.getDueDate()));
         }
         if (values.containsKey(Task.COMPLETION_DATE.name)) {
             if (task.isCompleted()) {
-                remoteModel.setCompleted(GtasksApiUtilities.unixTimeToGtasksCompletionTime(task.getValue(Task.COMPLETION_DATE)));
+                remoteModel.setCompleted(GtasksApiUtilities.unixTimeToGtasksCompletionTime(task.getCompletionDate()));
                 remoteModel.setStatus("completed"); //$NON-NLS-1$
             } else {
                 remoteModel.setCompleted(null);

astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java

@@ -344,7 +344,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
                     R.string.p_default_importance_key, Task.IMPORTANCE_SHOULD_DO));
             TaskDao.setDefaultReminders(task.task);
         }
-        if (!TextUtils.isEmpty(task.task.getValue(Task.TITLE))) {
+        if (!TextUtils.isEmpty(task.task.getTitle())) {
             task.task.putTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC, true);
             gtasksMetadataService.saveTaskAndMetadata(task);
         }
@@ -352,8 +352,8 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
 
     private void mergeDates(Task remote, Task local) {
         if(remote.hasDueDate() && local.hasDueTime()) {
-            Date newDate = newDate(remote.getValue(Task.DUE_DATE));
+            Date newDate = newDate(remote.getDueDate());
-            Date oldDate = newDate(local.getValue(Task.DUE_DATE));
+            Date oldDate = newDate(local.getDueDate());
             newDate.setHours(oldDate.getHours());
             newDate.setMinutes(oldDate.getMinutes());
             newDate.setSeconds(oldDate.getSeconds());

astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java

@@ -231,11 +231,11 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                 respondToPicture = true;
             }
         });
-        if(!TextUtils.isEmpty(task.getValue(Task.NOTES))) {
+        if(!TextUtils.isEmpty(task.getNotes())) {
             TextView notes = new TextView(getContext());
             notes.setLinkTextColor(Color.rgb(100, 160, 255));
             notes.setTextSize(18);
-            notes.setText(task.getValue(Task.NOTES));
+            notes.setText(task.getNotes());
             notes.setPadding(5, 10, 5, 10);
             Linkify.addLinks(notes, Linkify.ALL);
         }
@@ -356,7 +356,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
     }
 
     private void addComment() {
-        addComment(commentField.getText().toString(), UserActivity.ACTION_TASK_COMMENT, task.getUuid(), task.getValue(Task.TITLE), true);
+        addComment(commentField.getText().toString(), UserActivity.ACTION_TASK_COMMENT, task.getUuid(), task.getTitle(), true);
     }
 
     private void addComment(String message, String actionCode, String uuid, String title, boolean usePicture) {
@@ -424,7 +424,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
             return new NoteOrUpdate(title,
                     m.getValue(NoteMetadata.COMMENT_PICTURE),
                     null,
-                    m.getValue(Metadata.CREATION_DATE));
+                    m.getCreationDate());
         }
 
         public static NoteOrUpdate fromUpdate(UserActivity u) {
@@ -442,7 +442,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                 commentBitmap = u.getPictureBitmap(UserActivity.PICTURE);
             }
             title = UpdateAdapter.getUpdateComment(u);
-            createdAt = u.getValue(UserActivity.CREATED_AT);
+            createdAt = u.getCreatedAt();
 
             return new NoteOrUpdate(
                     title,
@@ -464,20 +464,20 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                 DateUtilities.getTimeString(getContext(), newDate())),
                 UserActivity.ACTION_TASK_COMMENT,
                 t.getUuid(),
-                t.getValue(Task.TITLE),
+                t.getTitle(),
                 false);
     }
 
     @Override
     public void timerStopped(Task t) {
-        String elapsedTime = DateUtils.formatElapsedTime(t.getValue(Task.ELAPSED_SECONDS));
+        String elapsedTime = DateUtils.formatElapsedTime(t.getElapsedSeconds());
         addComment(String.format("%s %s\n%s %s", //$NON-NLS-1$
                 getContext().getString(R.string.TEA_timer_comment_stopped),
                 DateUtilities.getTimeString(getContext(), newDate()),
                 getContext().getString(R.string.TEA_timer_comment_spent),
                 elapsedTime), UserActivity.ACTION_TASK_COMMENT,
                 t.getUuid(),
-                t.getValue(Task.TITLE),
+                t.getTitle(),
                 false);
     }
 

astrid/src/main/java/com/todoroo/astrid/notes/NotesDetailExposer.java

@@ -66,7 +66,7 @@ public class NotesDetailExposer extends BroadcastReceiver {
 
         StringBuilder notesBuilder = new StringBuilder();
 
-        String notes = task.getValue(Task.NOTES);
+        String notes = task.getNotes();
         if(!TextUtils.isEmpty(notes)) {
             if(notes.length() > NOTE_MAX) {
                 int lastSpace = notes.lastIndexOf(' ', NOTE_MAX);

astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java

@@ -199,11 +199,11 @@ public class Astrid2TaskProvider extends ContentProvider {
     			String taskTags = TagService.getInstance().getTagsAsString(task.getId(), TAG_SEPARATOR);
 
     			Object[] values = new Object[7];
-    			values[0] = task.getValue(Task.TITLE);
+    			values[0] = task.getTitle();
-    			values[1] = importanceColors[task.getValue(Task.IMPORTANCE)];
+    			values[1] = importanceColors[task.getImportance()];
-    			values[2] = task.getValue(Task.DUE_DATE);
+    			values[2] = task.getDueDate();
-    			values[3] = task.getValue(Task.DUE_DATE);
+    			values[3] = task.getDueDate();
-    			values[4] = task.getValue(Task.IMPORTANCE);
+    			values[4] = task.getImportance();
     			values[5] = task.getId();
     			values[6] = taskTags;
 

astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java

@@ -161,12 +161,12 @@ public class Notifications extends BroadcastReceiver {
             return false;
         }
         // you're done, or not yours - don't sound, do delete
-        if(task.isCompleted() || task.isDeleted() || !Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID))) {
+        if(task.isCompleted() || task.isDeleted() || !Task.USER_ID_SELF.equals(task.getUserID())) {
             return false;
         }
 
         // new task edit in progress
-        if(TextUtils.isEmpty(task.getValue(Task.TITLE))) {
+        if(TextUtils.isEmpty(task.getTitle())) {
             return false;
         }
 
@@ -176,15 +176,15 @@ public class Notifications extends BroadcastReceiver {
         }
 
         // task due date was changed, but alarm wasn't rescheduled
-        boolean dueInFuture = task.hasDueTime() && task.getValue(Task.DUE_DATE) > DateUtilities.now() ||
+        boolean dueInFuture = task.hasDueTime() && task.getDueDate() > DateUtilities.now() ||
-            !task.hasDueTime() && task.getValue(Task.DUE_DATE) - DateUtilities.now() > DateUtilities.ONE_DAY;
+            !task.hasDueTime() && task.getDueDate() - DateUtilities.now() > DateUtilities.ONE_DAY;
         if((type == ReminderService.TYPE_DUE || type == ReminderService.TYPE_OVERDUE) &&
                 (!task.hasDueDate() || dueInFuture)) {
             return true;
         }
 
         // read properties
-        String taskTitle = task.getValue(Task.TITLE);
+        String taskTitle = task.getTitle();
         boolean nonstopMode = task.getFlag(Task.REMINDER_FLAGS, Task.NOTIFY_MODE_NONSTOP);
         boolean ringFiveMode = task.getFlag(Task.REMINDER_FLAGS, Task.NOTIFY_MODE_FIVE);
         int ringTimes = nonstopMode ? -1 : (ringFiveMode ? 5 : 1);

astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java

@@ -197,7 +197,7 @@ public final class ReminderService  {
         // Make sure no alarms are scheduled other than the next one. When that one is shown, it
         // will schedule the next one after it, and so on and so forth.
         clearAllAlarms(task);
-        if(task.isCompleted() || task.isDeleted() || !Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID))) {
+        if(task.isCompleted() || task.isDeleted() || !Task.USER_ID_SELF.equals(task.getUserID())) {
             return;
         }
 
@@ -251,8 +251,8 @@ public final class ReminderService  {
      * has already passed, we do nothing.
      */
     private long calculateNextSnoozeReminder(Task task) {
-        if(task.getValue(Task.REMINDER_SNOOZE) > DateUtilities.now()) {
+        if(task.getReminderSnooze() > DateUtilities.now()) {
-            return task.getValue(Task.REMINDER_SNOOZE);
+            return task.getReminderSnooze();
         }
         return NO_ALARM;
     }
@@ -267,14 +267,14 @@ public final class ReminderService  {
     private long calculateNextOverdueReminder(Task task) {
      // Uses getNowValue() instead of DateUtilities.now()
         if(task.hasDueDate() && task.getFlag(Task.REMINDER_FLAGS, Task.NOTIFY_AFTER_DEADLINE)) {
-            Date due = newDate(task.getValue(Task.DUE_DATE));
+            Date due = newDate(task.getDueDate());
             if (!task.hasDueTime()) {
                 due.setHours(23);
                 due.setMinutes(59);
                 due.setSeconds(59);
             }
             long dueDateForOverdue = due.getTime();
-            long lastReminder = task.getValue(Task.REMINDER_LAST);
+            long lastReminder = task.getReminderLast();
 
             if(dueDateForOverdue > getNowValue()) {
                 return dueDateForOverdue + (long) ((0.5f + 2f * random.nextFloat()) * DateUtilities.ONE_HOUR);
@@ -286,7 +286,7 @@ public final class ReminderService  {
 
             if(getNowValue() - lastReminder < 6 * DateUtilities.ONE_HOUR) {
                 return getNowValue() + (long) ((2.0f +
-                        task.getValue(Task.IMPORTANCE) +
+                        task.getImportance() +
                         6f * random.nextFloat()) * DateUtilities.ONE_HOUR);
             }
 
@@ -308,8 +308,8 @@ public final class ReminderService  {
     long calculateNextDueDateReminder(Task task) {
         // Uses getNowValue() instead of DateUtilities.now()
         if(task.hasDueDate() && task.getFlag(Task.REMINDER_FLAGS, Task.NOTIFY_AT_DEADLINE)) {
-            long dueDate = task.getValue(Task.DUE_DATE);
+            long dueDate = task.getDueDate();
-            long lastReminder = task.getValue(Task.REMINDER_LAST);
+            long lastReminder = task.getReminderLast();
 
             long dueDateAlarm = NO_ALARM;
 
@@ -410,12 +410,12 @@ public final class ReminderService  {
      * future.
      */
     private long calculateNextRandomReminder(Task task) {
-        long reminderPeriod = task.getValue(Task.REMINDER_PERIOD);
+        long reminderPeriod = task.getReminderPeriod();
         if((reminderPeriod) > 0) {
-            long when = task.getValue(Task.REMINDER_LAST);
+            long when = task.getReminderLast();
 
             if(when == 0) {
-                when = task.getValue(Task.CREATION_DATE);
+                when = task.getCreationDate();
             }
 
             when += (long)(reminderPeriod * (0.85f + 0.3f * random.nextFloat()));
@@ -484,7 +484,7 @@ public final class ReminderService  {
                 }
 
                if(Constants.DEBUG) {
-                   Log.e("Astrid", "Reminder set for " + newDate(time) + " for (\"" + task.getValue(Task.TITLE) + "\" (" + task.getId() + "), " + type + ")");
+                   Log.e("Astrid", "Reminder set for " + newDate(time) + " for (\"" + task.getTitle() + "\" (" + task.getId() + "), " + type + ")");
                }
                 am.set(AlarmManager.RTC_WAKEUP, time, pendingIntent);
             }

astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java

@@ -162,7 +162,7 @@ public class RepeatControlSet extends PopupControlSet {
             recurrence = "";
         }
 
-        repeatUntilValue = model.getValue(Task.REPEAT_UNTIL);
+        repeatUntilValue = model.getRepeatUntil();
 
         if(recurrence.length() > 0) {
             try {
@@ -206,8 +206,8 @@ public class RepeatControlSet extends PopupControlSet {
     @Override
     protected void readFromTaskOnInitialize() {
         Date date;
-        if(model.getValue(Task.DUE_DATE) != 0) {
+        if(model.getDueDate() != 0) {
-            date = newDate(model.getValue(Task.DUE_DATE));
+            date = newDate(model.getDueDate());
 
             int dayOfWeek = date.getDay();
             for(int i = 0; i < 7; i++) {
@@ -221,7 +221,7 @@ public class RepeatControlSet extends PopupControlSet {
                 RRule rrule = new RRule(recurrence);
 
                 setRepeatValue(rrule.getInterval());
-                setRepeatUntilValue(model.getValue(Task.REPEAT_UNTIL));
+                setRepeatUntilValue(model.getRepeatUntil());
                 interval.setSelection(intervalValue);
 
                 // clear all day of week checks, then update them
@@ -365,7 +365,7 @@ public class RepeatControlSet extends PopupControlSet {
             result = result + ";FROM=COMPLETION"; //$NON-NLS-1$
         }
 
-        if (!result.equals(task.getValue(Task.RECURRENCE).replaceAll("BYDAY=;", "")))  //$NON-NLS-1$//$NON-NLS-2$
+        if (!result.equals(task.getRecurrence().replaceAll("BYDAY=;", "")))  //$NON-NLS-1$//$NON-NLS-2$
         {
             task.putTransitory(TaskService.TRANS_REPEAT_CHANGED, true);
         }

astrid/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java

@@ -70,8 +70,8 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
                 return;
             }
 
-            long oldDueDate = task.getValue(Task.DUE_DATE);
+            long oldDueDate = task.getDueDate();
-            long repeatUntil = task.getValue(Task.REPEAT_UNTIL);
+            long repeatUntil = task.getRepeatUntil();
 
             boolean repeatFinished = repeatUntil > 0 && newDueDate >= repeatUntil;
             if (repeatFinished) {
@@ -96,9 +96,9 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
     }
 
     public static void rescheduleTask(Task task, long newDueDate) {
-        long hideUntil = task.getValue(Task.HIDE_UNTIL);
+        long hideUntil = task.getHideUntil();
-        if(hideUntil > 0 && task.getValue(Task.DUE_DATE) > 0) {
+        if(hideUntil > 0 && task.getDueDate() > 0) {
-            hideUntil += newDueDate - task.getValue(Task.DUE_DATE);
+            hideUntil += newDueDate - task.getDueDate();
         }
 
         task.setValue(Task.COMPLETION_DATE, 0L);
@@ -254,9 +254,9 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
     private static Date setUpStartDate(Task task, boolean repeatAfterCompletion, Frequency frequency) {
         Date startDate = newDate();
         if(task.hasDueDate()) {
-            Date dueDate = newDate(task.getValue(Task.DUE_DATE));
+            Date dueDate = newDate(task.getDueDate());
             if(repeatAfterCompletion) {
-                startDate = newDate(task.getValue(Task.COMPLETION_DATE));
+                startDate = newDate(task.getCompletionDate());
             } else {
                 startDate = dueDate;
             }

astrid/src/main/java/com/todoroo/astrid/service/StartupService.java

@@ -213,9 +213,9 @@ public class StartupService {
                 Metadata m = new Metadata();
                 if (values != null) {
                     if (values.containsKey(TagData.NAME.name)) {
-                        m.setValue(TaskToTagMetadata.TAG_NAME, model.getValue(TagData.NAME));
+                        m.setValue(TaskToTagMetadata.TAG_NAME, model.getName());
                         PluginServices.getMetadataService().update(Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY),
-                                TaskToTagMetadata.TAG_UUID.eq(model.getValue(TagData.UUID))), m);
+                                TaskToTagMetadata.TAG_UUID.eq(model.getUUID())), m);
                     }
                 }
             }

astrid/src/main/java/com/todoroo/astrid/service/TaskService.java

@@ -139,7 +139,7 @@ public class TaskService {
                         continue;
                     }
 
-                    if(GtasksMetadata.METADATA_KEY.equals(metadata.getValue(Metadata.KEY))) {
+                    if(GtasksMetadata.METADATA_KEY.equals(metadata.getKey())) {
                         metadata.setValue(GtasksMetadata.ID, ""); //$NON-NLS-1$
                     }
 
@@ -163,7 +163,7 @@ public class TaskService {
             return;
         }
 
-        if(item.containsValue(Task.TITLE) && item.getValue(Task.TITLE).length() == 0) {
+        if(item.containsValue(Task.TITLE) && item.getTitle().length() == 0) {
             taskDao.delete(item.getId());
             item.setId(Task.NO_ID);
         } else {
@@ -351,7 +351,7 @@ public class TaskService {
         Task original = new Task();
         original.setId(itemId);
         Task clone = clone(original);
-        String userId = clone.getValue(Task.USER_ID);
+        String userId = clone.getUserID();
         if (!Task.USER_ID_SELF.equals(userId) && !ActFmPreferenceService.userId().equals(userId)) {
             clone.putTransitory(TRANS_ASSIGNED, true);
         }
@@ -414,7 +414,7 @@ public class TaskService {
             task.mergeWithoutReplacement(forTask);
         }
 
-        if (!Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID))) {
+        if (!Task.USER_ID_SELF.equals(task.getUserID())) {
             task.putTransitory(TRANS_ASSIGNED, true);
         }
 
@@ -427,7 +427,7 @@ public class TaskService {
             Metadata metadata = new Metadata();
             metadata.setValue(Metadata.TASK, task.getId());
             metadata.mergeWith(forMetadata);
-            if (TaskToTagMetadata.KEY.equals(metadata.getValue(Metadata.KEY))) {
+            if (TaskToTagMetadata.KEY.equals(metadata.getKey())) {
                 if (metadata.containsNonNullValue(TaskToTagMetadata.TAG_UUID) && !RemoteModel.NO_UUID.equals(metadata.getValue(TaskToTagMetadata.TAG_UUID))) {
                     // This is more efficient
                     TagService.getInstance().createLink(task, metadata.getValue(TaskToTagMetadata.TAG_NAME), metadata.getValue(TaskToTagMetadata.TAG_UUID));

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

@@ -286,7 +286,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
                 for (recurring.moveToFirst(); !recurring.isAfterLast(); recurring.moveToNext()) {
                     t.clear();
                     t.readFromCursor(recurring);
-                    if (!TextUtils.isEmpty(t.getValue(Task.RECURRENCE))) {
+                    if (!TextUtils.isEmpty(t.getRecurrence())) {
                         updater.moveToParentOf(t.getUuid(), itemId);
                         madeChanges = true;
                     }

astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java

@@ -278,7 +278,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
             @Override
             public void visitNode(Node node) {
                 Task childTask = taskService.fetchById(node.taskId, Task.RECURRENCE);
-                if(!TextUtils.isEmpty(childTask.getValue(Task.RECURRENCE))) {
+                if(!TextUtils.isEmpty(childTask.getRecurrence())) {
                     Metadata metadata = updater.getTaskMetadata(node.taskId);
                     metadata.setValue(updater.indentProperty(), parentIndent);
                     metadataService.save(metadata);

astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java

@@ -16,7 +16,7 @@ public class SubtasksFilterUpdater extends SubtasksUpdater<TaskListMetadata> {
         if (list == null) {
             return "[]"; //$NON-NLS-1$
         }
-        String order = list.getValue(TaskListMetadata.TASK_IDS);
+        String order = list.getTaskIDs();
         if (TextUtils.isEmpty(order) || "null".equals(order)) //$NON-NLS-1$
         {
             order = "[]"; //$NON-NLS-1$

astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java

@@ -91,9 +91,9 @@ public class SubtasksHelper {
     private static String getOrderString(TagData tagData, TaskListMetadata tlm) {
         String serialized;
         if (tlm != null) {
-            serialized = tlm.getValue(TaskListMetadata.TASK_IDS);
+            serialized = tlm.getTaskIDs();
         } else if (tagData != null) {
-            serialized = convertTreeToRemoteIds(tagData.getValue(TagData.TAG_ORDERING));
+            serialized = convertTreeToRemoteIds(tagData.getTagOrdering());
         } else {
             serialized = "[]"; //$NON-NLS-1$
         }

astrid/src/main/java/com/todoroo/astrid/tags/TagService.java

@@ -115,9 +115,9 @@ public final class TagService {
         }
 
         public Tag(TagData tagData) {
-            tag = tagData.getValue(TagData.NAME);
+            tag = tagData.getName();
-            count = tagData.getValue(TagData.TASK_COUNT);
+            count = tagData.getTaskCount();
-            uuid = tagData.getValue(TagData.UUID);
+            uuid = tagData.getUUID();
             image = tagData.getPictureUrl(TagData.PICTURE, RemoteModel.PICTURE_THUMB);
         }
 
@@ -198,7 +198,7 @@ public final class TagService {
                 existingTag.moveToFirst();
                 tagData = new TagData(existingTag);
             }
-            createLink(task, tagData.getValue(TagData.NAME), tagData.getValue(TagData.UUID));
+            createLink(task, tagData.getName(), tagData.getUUID());
         } finally {
             existingTag.close();
         }
@@ -207,7 +207,7 @@ public final class TagService {
     public void createLink(Task task, String tagName, String tagUuid) {
         Metadata link = TaskToTagMetadata.newTagMetadata(task.getId(), task.getUuid(), tagName, tagUuid);
         if (metadataDao.update(Criterion.and(MetadataCriteria.byTaskAndwithKey(task.getId(), TaskToTagMetadata.KEY),
-                    TaskToTagMetadata.TASK_UUID.eq(task.getValue(Task.UUID)), TaskToTagMetadata.TAG_UUID.eq(tagUuid)), link) <= 0) {
+                    TaskToTagMetadata.TASK_UUID.eq(task.getUUID()), TaskToTagMetadata.TAG_UUID.eq(tagUuid)), link) <= 0) {
             metadataDao.createNew(link);
         }
     }
@@ -335,10 +335,10 @@ public final class TagService {
                 tagData.setValue(TagData.NAME, tag);
                 tagDataService.save(tagData);
             }
-            if (existingLinks.contains(tagData.getValue(TagData.UUID))) {
+            if (existingLinks.contains(tagData.getUUID())) {
-                existingLinks.remove(tagData.getValue(TagData.UUID));
+                existingLinks.remove(tagData.getUUID());
             } else {
-                Metadata newLink = TaskToTagMetadata.newTagMetadata(taskId, taskUuid, tag, tagData.getValue(TagData.UUID));
+                Metadata newLink = TaskToTagMetadata.newTagMetadata(taskId, taskUuid, tag, tagData.getUUID());
                 metadataDao.createNew(newLink);
             }
         }
@@ -365,7 +365,7 @@ public final class TagService {
                 try {
                     if (tagData.getCount() > 0) {
                         tagData.moveToFirst();
-                        tagWithCase = new TagData(tagData).getValue(TagData.NAME);
+                        tagWithCase = new TagData(tagData).getName();
                     }
                 } finally {
                     tagData.close();

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

@@ -303,7 +303,7 @@ public final class TagsControlSet extends PopupControlSet {
 
         LinkedHashSet<String> tags = getTagSet();
 
-        TagService.getInstance().synchronizeTags(task.getId(), task.getValue(Task.UUID), tags);
+        TagService.getInstance().synchronizeTags(task.getId(), task.getUUID(), tags);
         Flags.set(Flags.TAGS_CHANGED);
         task.setValue(Task.MODIFICATION_DATE, DateUtilities.now());
     }

astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java

@@ -62,7 +62,7 @@ public class TimerActionControlSet extends TaskEditControlSet {
 
     @Override
     protected void readFromTaskOnInitialize() {
-        if (model.getValue(Task.TIMER_START) == 0) {
+        if (model.getTimerStart() == 0) {
             timerActive = false;
         } else {
             timerActive = true;
@@ -91,10 +91,10 @@ public class TimerActionControlSet extends TaskEditControlSet {
         timerButton.setImageResource(drawable);
 
 
-        long elapsed = model.getValue(Task.ELAPSED_SECONDS) * 1000L;
+        long elapsed = model.getElapsedSeconds() * 1000L;
         if (timerActive) {
             chronometer.setVisibility(View.VISIBLE);
-            elapsed += DateUtilities.now() - model.getValue(Task.TIMER_START);
+            elapsed += DateUtilities.now() - model.getTimerStart();
             chronometer.setBase(SystemClock.elapsedRealtime() - elapsed);
             if (elapsed > DateUtilities.ONE_DAY) {
                 chronometer.setOnChronometerTickListener(new OnChronometerTickListener() {

astrid/src/main/java/com/todoroo/astrid/timers/TimerDecorationExposer.java

@@ -32,8 +32,8 @@ public class TimerDecorationExposer {
     private static final int TIMING_BG_COLOR = Color.argb(200, 220, 50, 0);
 
     public TaskDecoration expose(Task task) {
-        if(task == null || (task.getValue(Task.ELAPSED_SECONDS) == 0 &&
+        if(task == null || (task.getElapsedSeconds() == 0 &&
-                task.getValue(Task.TIMER_START) == 0)) {
+                task.getTimerStart() == 0)) {
             return null;
         }
 
@@ -43,10 +43,10 @@ public class TimerDecorationExposer {
         decoration = new TaskDecoration(remoteViews,
                 TaskDecoration.POSITION_LEFT, 0);
 
-        long elapsed = task.getValue(Task.ELAPSED_SECONDS) * 1000L;
+        long elapsed = task.getElapsedSeconds() * 1000L;
-        if(task.getValue(Task.TIMER_START) != 0) {
+        if(task.getTimerStart() != 0) {
             decoration.color = TIMING_BG_COLOR;
-            elapsed += DateUtilities.now() - task.getValue(Task.TIMER_START);
+            elapsed += DateUtilities.now() - task.getTimerStart();
             decoration.decoration.setChronometer(R.id.timer, SystemClock.elapsedRealtime() -
                     elapsed, null, true);
             decoration.decoration.setViewVisibility(R.id.timer, View.VISIBLE);

astrid/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java

@@ -57,15 +57,15 @@ public class TimerPlugin extends BroadcastReceiver {
         }
 
         if(start) {
-            if(task.getValue(Task.TIMER_START) == 0) {
+            if(task.getTimerStart() == 0) {
                 task.setValue(Task.TIMER_START, DateUtilities.now());
             }
         } else {
-            if(task.getValue(Task.TIMER_START) > 0) {
+            if(task.getTimerStart() > 0) {
-                int newElapsed = (int)((DateUtilities.now() - task.getValue(Task.TIMER_START)) / 1000L);
+                int newElapsed = (int)((DateUtilities.now() - task.getTimerStart()) / 1000L);
                 task.setValue(Task.TIMER_START, 0L);
                 task.setValue(Task.ELAPSED_SECONDS,
-                        task.getValue(Task.ELAPSED_SECONDS) + newElapsed);
+                        task.getElapsedSeconds() + newElapsed);
             }
         }
         PluginServices.getTaskService().save(task);

astrid/src/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java

@@ -26,7 +26,7 @@ public class TimerTaskCompleteListener extends BroadcastReceiver {
 
         Task task = PluginServices.getTaskService().fetchById(taskId, Task.ID, Task.ELAPSED_SECONDS,
                 Task.TIMER_START);
-        if(task == null || task.getValue(Task.TIMER_START) == 0) {
+        if(task == null || task.getTimerStart() == 0) {
             return;
         }
 

astrid/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java

@@ -105,7 +105,7 @@ public class DateChangedAlerts {
 
         d.findViewById(R.id.reminder_snooze).setVisibility(View.GONE);
         d.findViewById(R.id.reminder_edit).setVisibility(View.GONE);
-        ((TextView) d.findViewById(R.id.reminder_title)).setText(activity.getString(R.string.TLA_repeat_scheduled_title, task.getValue(Task.TITLE)));
+        ((TextView) d.findViewById(R.id.reminder_title)).setText(activity.getString(R.string.TLA_repeat_scheduled_title, task.getTitle()));
 
         String speechBubbleText = constructSpeechBubbleTextForRepeat(activity, task);
 
@@ -176,11 +176,11 @@ public class DateChangedAlerts {
 
         int titleResource = lastTime ? R.string.repeat_rescheduling_dialog_title_last_time : R.string.repeat_rescheduling_dialog_title;
         ((TextView) d.findViewById(R.id.reminder_title)).setText(
-                activity.getString(titleResource, task.getValue(Task.TITLE)));
+                activity.getString(titleResource, task.getTitle()));
 
         String oldDueDateString = getRelativeDateAndTimeString(activity, oldDueDate);
         String newDueDateString = getRelativeDateAndTimeString(activity, newDueDate);
-        String repeatUntilDateString = getRelativeDateAndTimeString(activity, task.getValue(Task.REPEAT_UNTIL));
+        String repeatUntilDateString = getRelativeDateAndTimeString(activity, task.getRepeatUntil());
 
         String encouragement = "";
 
@@ -204,7 +204,7 @@ public class DateChangedAlerts {
                 d.dismiss();
                 task.setValue(Task.DUE_DATE, oldDueDate);
                 task.setValue(Task.COMPLETION_DATE, 0L);
-                long hideUntil = task.getValue(Task.HIDE_UNTIL);
+                long hideUntil = task.getHideUntil();
                 if (hideUntil > 0) {
                     task.setValue(Task.HIDE_UNTIL, hideUntil - (newDueDate - oldDueDate));
                 }
@@ -269,11 +269,11 @@ public class DateChangedAlerts {
         String[] priorityStrings = context.getResources().getStringArray(R.array.TLA_priority_strings);
         int[] colorsArray = new int[] { R.color.importance_1, R.color.importance_2, R.color.importance_3, R.color.importance_4 };
 
-        String title = task.getValue(Task.TITLE);
+        String title = task.getTitle();
-        long date = task.getValue(Task.DUE_DATE);
+        long date = task.getDueDate();
 
         String dueString = "";
-        if (!TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) {
+        if (!TextUtils.isEmpty(task.getRecurrence())) {
             dueString = getRecurrenceString(context, task);
         }
 
@@ -285,7 +285,7 @@ public class DateChangedAlerts {
             dueString = context.getString(R.string.TLA_quickadd_confirm_speech_bubble_date, dueString);
         }
 
-        int priority = task.getValue(Task.IMPORTANCE);
+        int priority = task.getImportance();
         if (priority >= priorityStrings.length) {
             priority = priorityStrings.length - 1;
         }

astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java

@@ -50,8 +50,8 @@ public class DeadlineControlSet extends PopupControlSet {
             isOverdue = !dateAndTimePicker.isAfterNow();
             displayString.append(dateAndTimePicker.getDisplayString(activity, isQuickadd, isQuickadd));
         } else {
-            isOverdue = model.getValue(Task.DUE_DATE) < DateUtilities.now();
+            isOverdue = model.getDueDate() < DateUtilities.now();
-            displayString.append(DateAndTimePicker.getDisplayString(activity, model.getValue(Task.DUE_DATE), isQuickadd, isQuickadd, false));
+            displayString.append(DateAndTimePicker.getDisplayString(activity, model.getDueDate(), isQuickadd, isQuickadd, false));
         }
 
         if (!isQuickadd && repeatControlSet != null) {
@@ -111,7 +111,7 @@ public class DeadlineControlSet extends PopupControlSet {
 
     @Override
     protected void readFromTaskOnInitialize() {
-        long dueDate = model.getValue(Task.DUE_DATE);
+        long dueDate = model.getDueDate();
         initializeWithDate(dueDate);
         refreshDisplayView();
     }
@@ -119,7 +119,7 @@ public class DeadlineControlSet extends PopupControlSet {
     @Override
     protected void writeToModelAfterInitialized(Task task) {
         long dueDate = dateAndTimePicker.constructDueDate();
-        if (dueDate != task.getValue(Task.DUE_DATE)) // Clear snooze if due date has changed
+        if (dueDate != task.getDueDate()) // Clear snooze if due date has changed
         {
             task.setValue(Task.REMINDER_SNOOZE, 0L);
         }

astrid/src/main/java/com/todoroo/astrid/ui/EditNotesControlSet.java

@@ -38,7 +38,7 @@ public class EditNotesControlSet extends PopupControlSet {
         if (initialized) {
             textToUse = editText.getText().toString();
         } else {
-            textToUse = model.getValue(Task.NOTES);
+            textToUse = model.getNotes();
         }
 
         if (TextUtils.isEmpty(textToUse)) {
@@ -77,8 +77,8 @@ public class EditNotesControlSet extends PopupControlSet {
 
     @Override
     protected void readFromTaskOnInitialize() {
-        editText.setTextKeepState(model.getValue(Task.NOTES));
+        editText.setTextKeepState(model.getNotes());
-        notesPreview.setText(model.getValue(Task.NOTES));
+        notesPreview.setText(model.getNotes());
         linkifyDisplayView();
     }
 

astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java

@@ -68,7 +68,7 @@ public class EditTitleControlSet extends TaskEditControlSet implements Importanc
 
     @Override
     protected void readFromTaskOnInitialize() {
-        editText.setTextKeepState(model.getValue(Task.TITLE));
+        editText.setTextKeepState(model.getTitle());
         completeBox.setChecked(model.isCompleted());
         completeBox.setOnClickListener(new OnClickListener() {
             @Override
@@ -109,8 +109,8 @@ public class EditTitleControlSet extends TaskEditControlSet implements Importanc
     @Override
     public void readFromTask(Task task) {
         super.readFromTask(task);
-        isRepeating = !TextUtils.isEmpty(task.getValue(Task.RECURRENCE));
+        isRepeating = !TextUtils.isEmpty(task.getRecurrence());
-        importanceValue = model.getValue(Task.IMPORTANCE);
+        importanceValue = model.getImportance();
     }
 
 

astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java

@@ -219,16 +219,16 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
 
     @Override
     public void readFromTask(Task task) {
-        long date = task.getValue(Task.HIDE_UNTIL);
+        long date = task.getHideUntil();
 
-        Date dueDay = newDate(task.getValue(Task.DUE_DATE)/1000L*1000L);
+        Date dueDay = newDate(task.getDueDate()/1000L*1000L);
 
         dueDay.setHours(0);
         dueDay.setMinutes(0);
         dueDay.setSeconds(0);
 
         // For the hide until due case, we need the time component
-        long dueTime = task.getValue(Task.DUE_DATE)/1000L*1000L;
+        long dueTime = task.getDueDate()/1000L*1000L;
 
         if(date == 0) {
             selection = 0;

astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java

@@ -127,14 +127,14 @@ public class ImportanceControlSet extends TaskEditControlSet {
     @Override
     public void readFromTask(Task task) {
         super.readFromTask(task);
-        setImportance(model.getValue(Task.IMPORTANCE));
+        setImportance(model.getImportance());
     }
 
     // Same as above because we need the setImportance listeners to fire even in
     // the case when the UI hasn't been created yet
     @Override
     protected void readFromTaskOnInitialize() {
-        setImportance(model.getValue(Task.IMPORTANCE));
+        setImportance(model.getImportance());
     }
 
     @Override

astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java

@@ -156,7 +156,7 @@ public class QuickAddBar extends LinearLayout {
             @Override
             public void onClick(View v) {
                 Task task = quickAddTask(quickAddBox.getText().toString(), true);
-                if (task != null && task.getValue(Task.TITLE).length() == 0) {
+                if (task != null && task.getTitle().length() == 0) {
                     mListener.onTaskListItemClicked(task.getId());
                 }
             }
@@ -229,7 +229,7 @@ public class QuickAddBar extends LinearLayout {
         TagData tagData = fragment.getActiveTagData();
         if (tagData != null) {
             HashSet<String> tagsTransitory = new HashSet<>();
-            tagsTransitory.add(tagData.getValue(TagData.NAME));
+            tagsTransitory.add(tagData.getName());
             empty.putTransitory(TaskService.TRANS_TAGS, tagsTransitory);
         }
         repeatControl.readFromTask(empty);
@@ -246,7 +246,7 @@ public class QuickAddBar extends LinearLayout {
     public Task quickAddTask(String title, boolean selectNewTask) {
         TagData tagData = fragment.getActiveTagData();
         if(tagData != null && (!tagData.containsNonNullValue(TagData.NAME) ||
-                tagData.getValue(TagData.NAME).length() == 0)) {
+                tagData.getName().length() == 0)) {
             DialogUtilities.okDialog(activity, activity.getString(R.string.tag_no_title_error), null);
             return null;
         }
@@ -285,7 +285,7 @@ public class QuickAddBar extends LinearLayout {
                 fragment.selectCustomId(task.getId());
                 if (task.getTransitory(TaskService.TRANS_QUICK_ADD_MARKUP) != null) {
                     showAlertForMarkupTask(activity, task, title);
-                } else if (!TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) {
+                } else if (!TextUtils.isEmpty(task.getRecurrence())) {
                     showAlertForRepeatingTask(activity, task);
                 }
             }
@@ -304,7 +304,7 @@ public class QuickAddBar extends LinearLayout {
         boolean gcalCreateEventEnabled = Preferences.getStringValue(R.string.gcal_p_default) != null
                 && !Preferences.getStringValue(R.string.gcal_p_default).equals("-1") && task.hasDueDate(); //$NON-NLS-1$
 
-        if (!TextUtils.isEmpty(title) && gcalCreateEventEnabled && TextUtils.isEmpty(task.getValue(Task.CALENDAR_URI))) {
+        if (!TextUtils.isEmpty(title) && gcalCreateEventEnabled && TextUtils.isEmpty(task.getCalendarURI())) {
             Uri calendarUri = GCalHelper.createTaskEvent(task,
                     ContextManager.getContext().getContentResolver(), new ContentValues());
             task.setValue(Task.CALENDAR_URI, calendarUri.toString());

astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java

@@ -75,7 +75,7 @@ public class RandomReminderControlSet extends TaskEditControlSet {
 
     @Override
     protected void readFromTaskOnInitialize() {
-        long time = model.getValue(Task.REMINDER_PERIOD);
+        long time = model.getReminderPeriod();
 
         boolean enabled = time > 0;
         if(time <= 0) {

astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java

@@ -150,7 +150,7 @@ public class ReminderControlSet extends PopupControlSet {
 
     @Override
     protected void readFromTaskOnInitialize() {
-        setValue(model.getValue(Task.REMINDER_FLAGS));
+        setValue(model.getReminderFlags());
         // Calls to get view will force other control sets to load
         randomControlSet.readFromTask(model);
         randomControlSet.readFromTaskOnInitialize();
@@ -170,7 +170,7 @@ public class ReminderControlSet extends PopupControlSet {
         StringBuilder reminderString = new StringBuilder();
 
         // Has random reminder?
-        if ((randomControlSet != null && randomControlSet.hasRandomReminder()) || (randomControlSet == null && model.getValue(Task.REMINDER_PERIOD) > 0)) {
+        if ((randomControlSet != null && randomControlSet.hasRandomReminder()) || (randomControlSet == null && model.getReminderPeriod() > 0)) {
             reminderString.append(activity.getString(R.string.TEA_reminder_randomly_short));
             reminderCount++;
         }
@@ -179,7 +179,7 @@ public class ReminderControlSet extends PopupControlSet {
         if (initialized) {
             value = getValue();
         } else {
-            value = model.getValue(Task.REMINDER_FLAGS);
+            value = model.getReminderFlags();
         }
 
         boolean appendedWhen = false;

astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java

@@ -43,7 +43,7 @@ public class TitleParser {
         return pattern;
     }
     public static void listHelper(Task task, ArrayList<String> tags) {
-        String inputText = task.getValue(Task.TITLE);
+        String inputText = task.getTitle();
         Pattern tagPattern = Pattern.compile("(\\s|^)#(\\(.*\\)|[^\\s]+)");
         Pattern contextPattern = Pattern.compile("(\\s|^)@(\\(.*\\)|[^\\s]+)");
 
@@ -97,7 +97,7 @@ public class TitleParser {
 
     //priorityHelper parses the string and sets the Task's importance
     private static boolean priorityHelper(Task task) {
-        String inputText = task.getValue(Task.TITLE);
+        String inputText = task.getTitle();
         String[] importanceStrings = {
                 "()((^|[^\\w!])!+|(^|[^\\w!])!\\d)($|[^\\w!])",
                 "()(?i)((\\s?bang){1,})$",
@@ -167,7 +167,7 @@ public class TitleParser {
         if (task.containsNonNullValue(Task.DUE_DATE)) {
             return false;
         }
-        String inputText = task.getValue(Task.TITLE);
+        String inputText = task.getTitle();
         Calendar cal = null;
         Boolean containsSpecificTime = false;
         String[] daysOfWeek = {
@@ -374,7 +374,7 @@ public class TitleParser {
         if (task.containsNonNullValue(Task.RECURRENCE)) {
             return false;
         }
-        String inputText = task.getValue(Task.TITLE);
+        String inputText = task.getTitle();
         HashMap<String, Frequency> repeatTimes = new HashMap<>();
         repeatTimes.put("(?i)\\bevery ?\\w{0,6} days?\\b" , Frequency.DAILY);
         repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?nights?\\b" , Frequency.DAILY);

astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java

@@ -135,7 +135,7 @@ public class WidgetUpdateService extends Service {
                 int textColor = r
                         .getColor(ThemeService.isDarkWidgetTheme() ? R.color.widget_text_color_dark : R.color.widget_text_color_light);
 
-                textContent = task.getValue(Task.TITLE);
+                textContent = task.getTitle();
 
                 if(task.isCompleted()) {
                     textColor = r.getColor(R.color.task_list_done);

astrid/src/main/java/org/tasks/widget/ScrollableViewsFactory.java

@@ -109,12 +109,12 @@ public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFac
     private int getCheckbox(Task task) {
         boolean completed = task.isCompleted();
 
-        int value = task.getValue(Task.IMPORTANCE);
+        int value = task.getImportance();
         if (value >= TaskAdapter.IMPORTANCE_RESOURCES.length) {
             value = TaskAdapter.IMPORTANCE_RESOURCES.length - 1;
         }
         int[] boxes;
-        if (!TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) {
+        if (!TextUtils.isEmpty(task.getRecurrence())) {
             boxes = completed ? TaskAdapter.IMPORTANCE_REPEAT_RESOURCES_CHECKED : TaskAdapter.IMPORTANCE_REPEAT_RESOURCES;
         } else {
             boxes = completed ? TaskAdapter.IMPORTANCE_RESOURCES_CHECKED : TaskAdapter.IMPORTANCE_RESOURCES;
@@ -130,7 +130,7 @@ public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFac
             Resources r = context.getResources();
             int textColor = r.getColor(dark ? R.color.widget_text_color_dark : R.color.widget_text_color_light);
 
-            textContent = task.getValue(Task.TITLE);
+            textContent = task.getTitle();
 
             RemoteViews row = new RemoteViews(Constants.PACKAGE, R.layout.widget_row);
 

astrid/src/main/java/org/tasks/widget/WidgetHelper.java

@@ -212,7 +212,7 @@ public class WidgetHelper {
         TagData tagData;
         if (id > 0) {
             tagData = tagDataService.fetchById(id, TagData.ID, TagData.NAME, TagData.TASK_COUNT, TagData.UUID, TagData.PICTURE, TagData.USER_ID, TagData.MEMBER_COUNT);
-            if (tagData != null && !tagData.getValue(TagData.NAME).equals(filter.title)) { // Tag has been renamed; rebuild filter
+            if (tagData != null && !tagData.getName().equals(filter.title)) { // Tag has been renamed; rebuild filter
                 filter = TagFilterExposer.filterFromTagData(context, tagData);
                 Preferences.setString(WidgetConfigActivity.PREF_SQL + widgetId, filter.getSqlQuery());
                 Preferences.setString(WidgetConfigActivity.PREF_TITLE + widgetId, filter.title);

astrid/src/test/java/com/todoroo/astrid/model/TaskTest.java

@@ -43,7 +43,7 @@ public class TaskTest extends TodorooRobolectricTestCase {
         freezeClock().thawAfter(new Snippet() {{
             Task task = new Task();
             taskService.save(task);
-            assertEquals(currentTimeMillis(), (long) task.getValue(Task.CREATION_DATE));
+            assertEquals(currentTimeMillis(), (long) task.getCreationDate());
         }});
     }
 

astrid/src/test/java/com/todoroo/astrid/reminders/ReminderServiceTest.java

@@ -65,7 +65,7 @@ public class ReminderServiceTest extends TodorooRobolectricTestCase {
                 if (time == ReminderService.NO_ALARM)
                     return;
                 super.createAlarm(task, time, type);
-                assertEquals((long)task.getValue(Task.DUE_DATE), time);
+                assertEquals((long)task.getDueDate(), time);
                 assertEquals(type, ReminderService.TYPE_DUE);
             }
         });
@@ -113,8 +113,8 @@ public class ReminderServiceTest extends TodorooRobolectricTestCase {
                 if (time == ReminderService.NO_ALARM)
                     return;
                 super.createAlarm(task, time, type);
-                assertTrue(time > task.getValue(Task.DUE_DATE));
+                assertTrue(time > task.getDueDate());
-                assertTrue(time < task.getValue(Task.DUE_DATE) + DateUtilities.ONE_DAY);
+                assertTrue(time < task.getDueDate() + DateUtilities.ONE_DAY);
                 assertEquals(type, ReminderService.TYPE_OVERDUE);
             }
         });
@@ -193,7 +193,7 @@ public class ReminderServiceTest extends TodorooRobolectricTestCase {
                 if (time == ReminderService.NO_ALARM)
                     return;
                 super.createAlarm(task, time, type);
-                assertEquals((long)task.getValue(Task.DUE_DATE), time);
+                assertEquals((long)task.getDueDate(), time);
                 assertEquals(type, ReminderService.TYPE_DUE);
             }
         });

astrid/src/test/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java

@@ -236,7 +236,7 @@ public class AdvancedRepeatTest extends TodorooRobolectricTestCase {
     }
 
     private void assertDueDate(long actual, int expectedWhich, int expectedDayOfWeek) {
-        long expected = getDate(task.getValue(Task.DUE_DATE), expectedWhich, expectedDayOfWeek);
+        long expected = getDate(task.getDueDate(), expectedWhich, expectedDayOfWeek);
         assertEquals(expected, actual);
     }
 

samples/filters/src/com/todoroo/astrid/data/Task.java

@@ -369,7 +369,7 @@ public final class Task extends AbstractModel {
      * Checks whether this due date has a due time or only a date
      */
     public boolean hasDueTime() {
-        return hasDueTime(getValue(Task.DUE_DATE));
+        return hasDueTime(getDUE_DATE());
     }
 
     /**

tests-sync/src/com/todoroo/astrid/gtasks/GtasksNewSyncTest.java

@@ -100,7 +100,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
         //Refetch remote task and assert that both local and remote titles match expected
         localTask = refetchLocalTask(localTask);
         remoteTask = refetchRemoteTask(remoteTask);
-        assertEquals(newTitle, localTask.getValue(Task.TITLE));
+        assertEquals(newTitle, localTask.getTITLE());
         assertEquals(newTitle, remoteTask.getTitle());
     }
 
@@ -125,20 +125,20 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
         remoteTask = refetchRemoteTask(remoteTask);
         localTask = refetchLocalTask(localTask);
         assertEquals(newRemoteTitle, remoteTask.getTitle());
-        assertEquals(newRemoteTitle, localTask.getValue(Task.TITLE));
+        assertEquals(newRemoteTitle, localTask.getTITLE());
     }
 
     public void testDateChangedLocally() throws Exception {
         if(bypassTests) return;
         Task localTask = createLocalTaskForDateTests(" locally");
-        String title = localTask.getValue(Task.TITLE);
+        String title = localTask.getTITLE();
-        long startDate = localTask.getValue(Task.DUE_DATE);
+        long startDate = localTask.getDUE_DATE();
 
         whenInvokeSync();
         com.google.api.services.tasks.model.Task remoteTask = assertTaskExistsRemotely(localTask, title);
         localTask = refetchLocalTask(localTask);
-        assertTrue(String.format("Expected %s, was %s", new Date(startDate), new Date(localTask.getValue(Task.DUE_DATE))),
+        assertTrue(String.format("Expected %s, was %s", new Date(startDate), new Date(localTask.getDUE_DATE())),
-                Math.abs(startDate - localTask.getValue(Task.DUE_DATE)) < 5000);
+                Math.abs(startDate - localTask.getDUE_DATE()) < 5000);
         long dueDate = GtasksApiUtilities.gtasksDueTimeToUnixTime(remoteTask.getDue(), 0);
         long createdDate = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, dueDate);
         assertEquals(startDate, createdDate);
@@ -154,7 +154,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
         //Refetch remote task and assert that both tasks match expected due date
         localTask = refetchLocalTask(localTask);
         remoteTask = refetchRemoteTask(remoteTask);
-        assertEquals(newDueDate, localTask.getValue(Task.DUE_DATE).longValue());
+        assertEquals(newDueDate, localTask.getDUE_DATE().longValue());
         dueDate = GtasksApiUtilities.gtasksDueTimeToUnixTime(remoteTask.getDue(), 0);
         createdDate = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, dueDate);
         assertEquals(newDueDate, createdDate);
@@ -163,14 +163,14 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     public void testDateChangedRemotely() throws Exception {
         if(bypassTests) return;
         Task localTask = createLocalTaskForDateTests(" remotely");
-        String title = localTask.getValue(Task.TITLE);
+        String title = localTask.getTITLE();
-        long startDate = localTask.getValue(Task.DUE_DATE);
+        long startDate = localTask.getDUE_DATE();
 
         whenInvokeSync();
         com.google.api.services.tasks.model.Task remoteTask = assertTaskExistsRemotely(localTask, title);
         localTask = refetchLocalTask(localTask);
-        assertTrue(String.format("Expected %s, was %s", new Date(startDate), new Date(localTask.getValue(Task.DUE_DATE))),
+        assertTrue(String.format("Expected %s, was %s", new Date(startDate), new Date(localTask.getDUE_DATE())),
-                Math.abs(startDate - localTask.getValue(Task.DUE_DATE)) < 5000);
+                Math.abs(startDate - localTask.getDUE_DATE()) < 5000);
         long dueDate = GtasksApiUtilities.gtasksDueTimeToUnixTime(remoteTask.getDue(), 0);
         long createdDate = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, dueDate);
         assertEquals(startDate, createdDate);
@@ -187,7 +187,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
         //Refetch remote task and assert that both tasks match expected due date
         localTask = refetchLocalTask(localTask);
         remoteTask = refetchRemoteTask(remoteTask);
-        assertEquals(newDueDate, localTask.getValue(Task.DUE_DATE).longValue());
+        assertEquals(newDueDate, localTask.getDUE_DATE().longValue());
         dueDate = GtasksApiUtilities.gtasksDueTimeToUnixTime(remoteTask.getDue(), 0);
         createdDate = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, dueDate);
         assertEquals(newDueDate, createdDate);
@@ -197,14 +197,14 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     public void testDateChangedBoth_ChooseLocal() throws Exception {
         if(bypassTests) return;
         Task localTask = createLocalTaskForDateTests(" remotely");
-        String title = localTask.getValue(Task.TITLE);
+        String title = localTask.getTITLE();
-        long startDate = localTask.getValue(Task.DUE_DATE);
+        long startDate = localTask.getDUE_DATE();
 
         whenInvokeSync();
         com.google.api.services.tasks.model.Task remoteTask = assertTaskExistsRemotely(localTask, title);
         localTask = refetchLocalTask(localTask);
-        assertTrue(String.format("Expected %s, was %s", new Date(startDate), new Date(localTask.getValue(Task.DUE_DATE))),
+        assertTrue(String.format("Expected %s, was %s", new Date(startDate), new Date(localTask.getDUE_DATE())),
-                Math.abs(startDate - localTask.getValue(Task.DUE_DATE)) < 5000);
+                Math.abs(startDate - localTask.getDUE_DATE()) < 5000);
         long dueDate = GtasksApiUtilities.gtasksDueTimeToUnixTime(remoteTask.getDue(), 0);
         long createdDate = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, dueDate);
         assertEquals(startDate, createdDate);
@@ -227,7 +227,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
         //Refetch both and assert that due dates match the one we set to local (more recent)
         localTask = refetchLocalTask(localTask);
         remoteTask = refetchRemoteTask(remoteTask);
-        assertEquals(newLocalDate, localTask.getValue(Task.DUE_DATE).longValue());
+        assertEquals(newLocalDate, localTask.getDUE_DATE().longValue());
         dueDate = GtasksApiUtilities.gtasksDueTimeToUnixTime(remoteTask.getDue(), 0);
         createdDate = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, dueDate);
         assertEquals(newLocalDate, createdDate);
@@ -236,14 +236,14 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     public void DISABLED_testDateChangedBoth_ChooseRemote() throws Exception {
         if(bypassTests) return;
         Task localTask = createLocalTaskForDateTests(" remotely");
-        String title = localTask.getValue(Task.TITLE);
+        String title = localTask.getTITLE();
-        long startDate = localTask.getValue(Task.DUE_DATE);
+        long startDate = localTask.getDUE_DATE();
 
         whenInvokeSync();
         com.google.api.services.tasks.model.Task remoteTask = assertTaskExistsRemotely(localTask, title);
         localTask = refetchLocalTask(localTask);
-        assertTrue(String.format("Expected %s, was %s", new Date(startDate), new Date(localTask.getValue(Task.DUE_DATE))),
+        assertTrue(String.format("Expected %s, was %s", new Date(startDate), new Date(localTask.getDUE_DATE())),
-                Math.abs(startDate - localTask.getValue(Task.DUE_DATE)) < 5000);
+                Math.abs(startDate - localTask.getDUE_DATE()) < 5000);
         assertEquals(startDate, GtasksApiUtilities.gtasksDueTimeToUnixTime(remoteTask.getDue(), 0));
         AndroidUtilities.sleepDeep(TIME_BETWEEN_SYNCS);
 
@@ -265,7 +265,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
         //Refetch both and assert that due dates match the one we set to local (more recent)
         localTask = refetchLocalTask(localTask);
         remoteTask = refetchRemoteTask(remoteTask);
-        assertEquals(newLocalDate, localTask.getValue(Task.DUE_DATE).longValue());
+        assertEquals(newLocalDate, localTask.getDUE_DATE().longValue());
         assertEquals(newLocalDate, GtasksApiUtilities.gtasksDueTimeToUnixTime(remoteTask.getDue(), 0));
     }
 
@@ -288,13 +288,13 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     public void testNoteEditedLocally() throws Exception {
         if(bypassTests) return;
         Task localTask = createLocalTaskForNoteTests(" locally");
-        String title = localTask.getValue(Task.TITLE);
+        String title = localTask.getTITLE();
-        String originalNote = localTask.getValue(Task.NOTES);
+        String originalNote = localTask.getNOTES();
 
         whenInvokeSync();
 
         com.google.api.services.tasks.model.Task remoteTask = assertTaskExistsRemotely(localTask, title);
-        assertEquals(originalNote, localTask.getValue(Task.NOTES));
+        assertEquals(originalNote, localTask.getNOTES());
         assertEquals(originalNote, remoteTask.getNotes());
 
         AndroidUtilities.sleepDeep(TIME_BETWEEN_SYNCS);
@@ -307,20 +307,20 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
 
         localTask = refetchLocalTask(localTask);
         remoteTask = refetchRemoteTask(remoteTask);
-        assertEquals(newNote, localTask.getValue(Task.NOTES));
+        assertEquals(newNote, localTask.getNOTES());
         assertEquals(newNote, remoteTask.getNotes());
     }
 
     public void testNoteEditedRemotely() throws Exception {
         if(bypassTests) return;
         Task localTask = createLocalTaskForNoteTests(" remotely");
-        String title = localTask.getValue(Task.TITLE);
+        String title = localTask.getTITLE();
-        String originalNote = localTask.getValue(Task.NOTES);
+        String originalNote = localTask.getNOTES();
 
         whenInvokeSync();
 
         com.google.api.services.tasks.model.Task remoteTask = assertTaskExistsRemotely(localTask, title);
-        assertEquals(originalNote, localTask.getValue(Task.NOTES));
+        assertEquals(originalNote, localTask.getNOTES());
         assertEquals(originalNote, remoteTask.getNotes());
 
         AndroidUtilities.sleepDeep(TIME_BETWEEN_SYNCS);
@@ -333,20 +333,20 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
 
         localTask = refetchLocalTask(localTask);
         remoteTask = refetchRemoteTask(remoteTask);
-        assertEquals(newNote, localTask.getValue(Task.NOTES));
+        assertEquals(newNote, localTask.getNOTES());
         assertEquals(newNote, remoteTask.getNotes());
     }
 
     public void DISABLED_testNoteEditedBoth() throws Exception {
         if(bypassTests) return;
         Task localTask = createLocalTaskForNoteTests(" remotely");
-        String title = localTask.getValue(Task.TITLE);
+        String title = localTask.getTITLE();
-        String originalNote = localTask.getValue(Task.NOTES);
+        String originalNote = localTask.getNOTES();
 
         whenInvokeSync();
 
         com.google.api.services.tasks.model.Task remoteTask = assertTaskExistsRemotely(localTask, title);
-        assertEquals(originalNote, localTask.getValue(Task.NOTES));
+        assertEquals(originalNote, localTask.getNOTES());
         assertEquals(originalNote, remoteTask.getNotes());
 
         AndroidUtilities.sleepDeep(TIME_BETWEEN_SYNCS);
@@ -366,7 +366,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
 
         localTask = refetchLocalTask(localTask);
         remoteTask = refetchRemoteTask(remoteTask);
-        System.err.println("Local note: " + localTask.getValue(Task.NOTES));
+        System.err.println("Local note: " + localTask.getNOTES());
         System.err.println("Remote note: " + remoteTask.getNotes());
     }
 
@@ -401,8 +401,8 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
 
         localTask = refetchLocalTask(localTask);
         remoteTask = refetchRemoteTask(remoteTask);
-        assertTrue(String.format("Expected %s, was %s", new Date(completion), new Date(localTask.getValue(Task.COMPLETION_DATE))),
+        assertTrue(String.format("Expected %s, was %s", new Date(completion), new Date(localTask.getCOMPLETION_DATE())),
-                Math.abs(completion - localTask.getValue(Task.COMPLETION_DATE)) < 5000);
+                Math.abs(completion - localTask.getCOMPLETION_DATE()) < 5000);
         assertEquals("completed", remoteTask.getStatus());
     }
 
@@ -425,8 +425,8 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
 
         localTask = refetchLocalTask(localTask);
         remoteTask = refetchRemoteTask(remoteTask);
-        assertTrue(String.format("Expected %s, was %s", new Date(completion), new Date(localTask.getValue(Task.COMPLETION_DATE))),
+        assertTrue(String.format("Expected %s, was %s", new Date(completion), new Date(localTask.getCOMPLETION_DATE())),
-                Math.abs(completion - localTask.getValue(Task.COMPLETION_DATE)) < 5000);
+                Math.abs(completion - localTask.getCOMPLETION_DATE()) < 5000);
         assertEquals("completed", remoteTask.getStatus());
     }
 
@@ -447,7 +447,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
 
         //Do a basic title match
         assertNotNull(remoteTask);
-        assertEquals(title, localTask.getValue(Task.TITLE));
+        assertEquals(title, localTask.getTITLE());
         assertEquals(title, remoteTask.getTitle());
         return remoteTask;
     }
@@ -460,12 +460,12 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
 
         assertNotNull(localTask);
         assertEquals(title, remoteTask.getTitle());
-        assertEquals(title, localTask.getValue(Task.TITLE));
+        assertEquals(title, localTask.getTITLE());
         return localTask;
     }
 
     private Task refetchLocalTask(Task localTask) {
-        return taskService.fetchById(localTask.getValue(Task.ID), Task.PROPERTIES);
+        return taskService.fetchById(localTask.getID(), Task.PROPERTIES);
     }
 
     private com.google.api.services.tasks.model.Task refetchRemoteTask(com.google.api.services.tasks.model.Task remoteTask) throws Exception {

tests-sync/src/com/todoroo/astrid/gtasks/GtasksSyncOnSaveTest.java

@@ -148,7 +148,7 @@ public class GtasksSyncOnSaveTest extends DatabaseTestCase {
 
         com.google.api.services.tasks.model.Task remoteTask = getRemoteTaskForLocalId(localTask.getId());
         assertTrue(remoteTask.getDeleted());
-        assertFalse(taskWithTitleExists(localTask.getValue(Task.TITLE)));
+        assertFalse(taskWithTitleExists(localTask.getTITLE()));
     }
 
     private boolean taskWithTitleExists(String title) throws IOException {

tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java

@@ -153,15 +153,15 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
         try {
             for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 Task task = new Task(cursor);
-                System.err.println("Task: " + task.getValue(Task.TITLE) + ", due: " + task.getValue(Task.DUE_DATE));
+                System.err.println("Task: " + task.getTITLE() + ", due: " + task.getDUE_DATE());
             }
             assertEquals(1, cursor.getCount());
             cursor.moveToFirst();
             t.readFromCursor(cursor);
 
-            assertEquals(title, t.getValue(Task.TITLE));
+            assertEquals(title, t.getTITLE());
             assertFalse(t.isCompleted());
-            long newDueDate = t.getValue(Task.DUE_DATE);
+            long newDueDate = t.getDUE_DATE();
             assertTrue(t.hasDueTime());
 
             long fromDate = (fromCompletion? completionDate : dueDate);

tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java

@@ -95,7 +95,7 @@ public class RepeatTestsGtasksSync extends AbstractSyncRepeatTests<com.google.ap
             fail("Exception in gtasks service");
         }
         assertNotNull(remote);
-        assertEquals(t.getValue(Task.TITLE), remote.getTitle());
+        assertEquals(t.getTITLE(), remote.getTitle());
 
         Date expected = new Date(expectedRemoteTime);
         expected.setHours(0);
@@ -122,7 +122,7 @@ public class RepeatTestsGtasksSync extends AbstractSyncRepeatTests<com.google.ap
         }
 
         assertNotNull(remote);
-        assertEquals(t.getValue(Task.TITLE), remote.getTitle());
+        assertEquals(t.getTITLE(), remote.getTitle());
     }
 
     private void initializeTestService() throws Exception {