Remove unused UserActivity columns

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

@@ -27,10 +27,6 @@ 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");
@@ -47,10 +43,6 @@ public class UserActivity extends RemoteModel {
     public static final StringProperty TARGET_ID = new StringProperty(
             TABLE, "target_id");
 
-    /** Target name */
-    public static final StringProperty TARGET_NAME = new StringProperty(
-            TABLE, "target_name");
-
     /** Created at */
     public static final LongProperty CREATED_AT = new LongProperty(
             TABLE, "created_at", Property.PROP_FLAG_DATE);
@@ -82,12 +74,10 @@ public class UserActivity extends RemoteModel {
     }
 
     static {
-        defaultValues.put(UUID.name, NO_UUID);
         defaultValues.put(ACTION.name, "");
         defaultValues.put(MESSAGE.name, "");
         defaultValues.put(PICTURE.name, "");
         defaultValues.put(TARGET_ID.name, NO_UUID);
-        defaultValues.put(TARGET_NAME.name, "");
         defaultValues.put(CREATED_AT.name, 0L);
         defaultValues.put(DELETED_AT.name, 0L);
     }
@@ -118,10 +108,6 @@ public class UserActivity extends RemoteModel {
         setValue(MESSAGE, message);
     }
 
-    public void setTargetName(String targetName) {
-        setValue(TARGET_NAME, targetName);
-    }
-
     public void setTargetId(String targetId) {
         setValue(TARGET_ID, targetId);
     }
@@ -130,10 +116,6 @@ 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/actfm/sync/messages/NameMaps.java

@@ -116,12 +116,10 @@ public class NameMaps {
         USER_ACTIVITY_COLUMNS_LOCAL_TO_SERVER = new HashMap<>();
         USER_ACTIVITY_PROPERTIES_EXCLUDED = new HashSet<>();
 
-        putUserActivityPropertyToServerName(UserActivity.UUID,        "uuid",        false);
         putUserActivityPropertyToServerName(UserActivity.ACTION,      "action",      true);
         putUserActivityPropertyToServerName(UserActivity.MESSAGE,     "message",     true);
         putUserActivityPropertyToServerName(UserActivity.PICTURE,     "picture",     true);
         putUserActivityPropertyToServerName(UserActivity.TARGET_ID,   "target_id",   true);
-        putUserActivityPropertyToServerName(UserActivity.TARGET_NAME, "target_name", false);
         putUserActivityPropertyToServerName(UserActivity.CREATED_AT,  "created_at",  true);
         putUserActivityPropertyToServerName(UserActivity.DELETED_AT,  "deleted_at",  true);
     }

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

@@ -75,11 +75,9 @@ 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,
-            UserActivity.TARGET_NAME,
             UserActivity.PICTURE,
             UserActivity.ID,
             ACTIVITY_TYPE_PROPERTY,
@@ -363,12 +361,10 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
     private static void readUserActivityProperties(TodorooCursor<UserActivity> unionCursor, UserActivity activity) {
         activity.setCreatedAt(unionCursor.getLong(0));
-        activity.setUUID(unionCursor.getString(1));
+        activity.setAction(unionCursor.getString(1));
-        activity.setAction(unionCursor.getString(2));
+        activity.setMessage(unionCursor.getString(2));
-        activity.setMessage(unionCursor.getString(3));
+        activity.setTargetId(unionCursor.getString(3));
-        activity.setTargetId(unionCursor.getString(4));
+        activity.setPicture(unionCursor.getString(4));
-        activity.setTargetName(unionCursor.getString(5));
-        activity.setPicture(unionCursor.getString(6));
     }
 
     public View getUpdateNotes(NoteOrUpdate note, ViewGroup parent) {
@@ -433,7 +429,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         userActivity.setMessage(message);
         userActivity.setAction(actionCode);
         userActivity.setTargetId(uuid);
-        userActivity.setTargetName(title);
         userActivity.setCreatedAt(DateUtilities.now());
         if (usePicture && pendingCommentPicture != null) {
             JSONObject pictureJson = RemoteModel.PictureHelper.savePictureJson(pendingCommentPicture);