Restore UUID to UserActivity

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

@@ -13,7 +13,6 @@ import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.Table;
 import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.andlib.utility.DateUtilities;
 
 /**
  * Data Model which represents a user.
@@ -67,6 +66,7 @@ public final class TaskAttachment extends RemoteModel {
     private static final ContentValues defaultValues = new ContentValues();
 
     static {
+        defaultValues.put(UUID.name, NO_UUID);
         defaultValues.put(TASK_UUID.name, NO_UUID);
         defaultValues.put(NAME.name, "");
         defaultValues.put(FILE_PATH.name, "");

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

@@ -27,6 +27,10 @@ public class UserActivity extends RemoteModel {
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
+    /** Remote ID */
+    public static final StringProperty UUID = new StringProperty(
+            TABLE, UUID_PROPERTY_NAME);
+
     /** Action */
     public static final StringProperty ACTION = new StringProperty(
             TABLE, "action");
@@ -74,6 +78,7 @@ public class UserActivity extends RemoteModel {
     }
 
     static {
+        defaultValues.put(UUID.name, NO_UUID);
         defaultValues.put(ACTION.name, "");
         defaultValues.put(MESSAGE.name, "");
         defaultValues.put(PICTURE.name, "");
@@ -116,6 +121,10 @@ public class UserActivity extends RemoteModel {
         setValue(ACTION, action);
     }
 
+    public void setUUID(String uuid) {
+        setValue(UUID, uuid);
+    }
+
     public void setPicture(String picture) {
         setValue(PICTURE, picture);
     }

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

@@ -75,6 +75,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
     private static final Property<?>[] USER_ACTIVITY_PROPERTIES = {
             UserActivity.CREATED_AT,
+            UserActivity.UUID,
             UserActivity.ACTION,
             UserActivity.MESSAGE,
             UserActivity.TARGET_ID,
@@ -361,10 +362,11 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
     private static void readUserActivityProperties(TodorooCursor<UserActivity> unionCursor, UserActivity activity) {
         activity.setCreatedAt(unionCursor.getLong(0));
-        activity.setAction(unionCursor.getString(1));
+        activity.setUUID(unionCursor.getString(1));
-        activity.setMessage(unionCursor.getString(2));
+        activity.setAction(unionCursor.getString(2));
-        activity.setTargetId(unionCursor.getString(3));
+        activity.setMessage(unionCursor.getString(3));
-        activity.setPicture(unionCursor.getString(4));
+        activity.setTargetId(unionCursor.getString(4));
+        activity.setPicture(unionCursor.getString(5));
     }
 
     public View getUpdateNotes(NoteOrUpdate note, ViewGroup parent) {