From 53698cdb022c4df6e93d35edf6350081a7d377d1 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 23 Jan 2013 17:11:33 -0800 Subject: [PATCH] Added task classification column --- api/src/com/todoroo/astrid/data/Task.java | 4 +++ .../astrid/actfm/sync/messages/NameMaps.java | 35 ++++++++++--------- .../src/com/todoroo/astrid/dao/Database.java | 1 + 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/api/src/com/todoroo/astrid/data/Task.java b/api/src/com/todoroo/astrid/data/Task.java index 234a63296..46e3c6fb0 100644 --- a/api/src/com/todoroo/astrid/data/Task.java +++ b/api/src/com/todoroo/astrid/data/Task.java @@ -148,6 +148,9 @@ public final class Task extends RemoteModel { public static final StringProperty CALENDAR_URI = new StringProperty( TABLE, "calendarUri"); + public static final StringProperty CLASSIFICATION = new StringProperty( + TABLE, "classification"); + // --- for astrid.com /** Remote id */ @@ -285,6 +288,7 @@ public final class Task extends RemoteModel { defaultValues.put(DETAILS_DATE.name, 0); defaultValues.put(IS_PUBLIC.name, 0); defaultValues.put(IS_READONLY.name, 0); + defaultValues.put(CLASSIFICATION.name, ""); defaultValues.put(LAST_SYNC.name, 0); defaultValues.putNull(REMOTE_ID.name); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java index 469cb2d2a..7f1135d67 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java @@ -82,23 +82,24 @@ public class NameMaps { TASK_COLUMN_NAMES_TO_PROPERTIES = new HashMap>(); TASK_PROPERTIES_EXCLUDED = new HashSet(); - putTaskPropertyToServerName(Task.TITLE, "title", false); - putTaskPropertyToServerName(Task.IMPORTANCE, "importance", false); - putTaskPropertyToServerName(Task.DUE_DATE, "due", false); - putTaskPropertyToServerName(Task.HIDE_UNTIL, "hide_until", true); - putTaskPropertyToServerName(Task.CREATION_DATE, "created_at", false); - putTaskPropertyToServerName(Task.COMPLETION_DATE, "completed_at", false); - putTaskPropertyToServerName(Task.RECURRENCE, "repeat", false); - putTaskPropertyToServerName(Task.DELETION_DATE, "deleted_at", false); - putTaskPropertyToServerName(Task.NOTES, "notes", false); - putTaskPropertyToServerName(Task.RECURRENCE, "repeat", false); - putTaskPropertyToServerName(Task.USER_ID, "user_id", false); - putTaskPropertyToServerName(Task.USER, "user", true); - putTaskPropertyToServerName(Task.CREATOR_ID, "creator_id", true); - putTaskPropertyToServerName(Task.UUID, "uuid", true); - putTaskPropertyToServerName(Task.PUSHED_AT, "pushed_at", true); - putTaskPropertyToServerName(Task.IS_PUBLIC, "public", false); - putTaskPropertyToServerName(Task.IS_READONLY, "read_only", true); + putTaskPropertyToServerName(Task.TITLE, "title", false); + putTaskPropertyToServerName(Task.IMPORTANCE, "importance", false); + putTaskPropertyToServerName(Task.DUE_DATE, "due", false); + putTaskPropertyToServerName(Task.HIDE_UNTIL, "hide_until", true); + putTaskPropertyToServerName(Task.CREATION_DATE, "created_at", false); + putTaskPropertyToServerName(Task.COMPLETION_DATE, "completed_at", false); + putTaskPropertyToServerName(Task.RECURRENCE, "repeat", false); + putTaskPropertyToServerName(Task.DELETION_DATE, "deleted_at", false); + putTaskPropertyToServerName(Task.NOTES, "notes", false); + putTaskPropertyToServerName(Task.RECURRENCE, "repeat", false); + putTaskPropertyToServerName(Task.USER_ID, "user_id", false); + putTaskPropertyToServerName(Task.USER, "user", true); + putTaskPropertyToServerName(Task.CREATOR_ID, "creator_id", true); + putTaskPropertyToServerName(Task.UUID, "uuid", true); + putTaskPropertyToServerName(Task.PUSHED_AT, "pushed_at", true); + putTaskPropertyToServerName(Task.IS_PUBLIC, "public", false); + putTaskPropertyToServerName(Task.IS_READONLY, "read_only", true); + putTaskPropertyToServerName(Task.CLASSIFICATION, "classification", true); TASK_PROPERTIES_SERVER_TO_LOCAL = AndroidUtilities.reverseMap(TASK_PROPERTIES_LOCAL_TO_SERVER); } diff --git a/astrid/src/com/todoroo/astrid/dao/Database.java b/astrid/src/com/todoroo/astrid/dao/Database.java index fe8e4d764..3d2ddbb32 100644 --- a/astrid/src/com/todoroo/astrid/dao/Database.java +++ b/astrid/src/com/todoroo/astrid/dao/Database.java @@ -364,6 +364,7 @@ public class Database extends AbstractDatabase { database.execSQL(addColumnSql(Task.TABLE, Task.UUID, visitor, null)); database.execSQL(addColumnSql(Task.TABLE, Task.IS_PUBLIC, visitor, "0")); database.execSQL(addColumnSql(Task.TABLE, Task.IS_READONLY, visitor, "0")); + database.execSQL(addColumnSql(Task.TABLE, Task.CLASSIFICATION, visitor, null)); database.execSQL(addColumnSql(TagData.TABLE, TagData.PUSHED_AT, visitor, null)); database.execSQL(addColumnSql(TagData.TABLE, TagData.UUID, visitor, null)); database.execSQL(addColumnSql(Update.TABLE, Update.PUSHED_AT, visitor, null));