diff --git a/api/src/main/java/com/todoroo/astrid/data/Update.java b/api/src/main/java/com/todoroo/astrid/data/Update.java deleted file mode 100644 index bbc43a8d6..000000000 --- a/api/src/main/java/com/todoroo/astrid/data/Update.java +++ /dev/null @@ -1,143 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.data; - -import android.content.ContentValues; - -import com.todoroo.andlib.data.Property; -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; - - - -/** - * Data Model which represents an update (e.g. a comment or data update event) - * - * @author Tim Su - * - */ -@Deprecated -public class Update extends RemoteModel { - - // --- table - - /** table for this model */ - public static final Table TABLE = new Table("updates", Update.class); - - // --- properties - - /** ID */ - public static final LongProperty ID = new LongProperty( - TABLE, ID_PROPERTY_NAME); - - /** Remote ID */ - public static final LongProperty REMOTE_ID = new LongProperty( - TABLE, UUID_PROPERTY_NAME); - - /** Associated Task remote-id (if any) */ - public static final LongProperty TASK = new LongProperty( - TABLE, "task"); - - /** Associated Task local-id (if any) */ - public static final LongProperty TASK_LOCAL = new LongProperty( - TABLE, "taskLocal"); - - /** Associated Tag remote-ids (comma separated list with leading and trailing commas) */ - public static final StringProperty TAGS = new StringProperty( - TABLE, "tag"); - - /** Associated Tag local-ids (comma separated list with leading and trailing commas) */ - public static final StringProperty TAGS_LOCAL = new StringProperty( - TABLE, "tagsLocal"); - - /** From user id */ - public static final LongProperty USER_ID = new LongProperty( - TABLE, USER_ID_PROPERTY_NAME); - - /** From User Object (JSON) */ - public static final StringProperty USER = new StringProperty( - TABLE, USER_JSON_PROPERTY_NAME); - - /** Other user id */ - public static final LongProperty OTHER_USER_ID = new LongProperty( - TABLE, "other_user_id"); - - /** Other User Object (JSON) */ - public static final StringProperty OTHER_USER = new StringProperty( - TABLE, "other_user"); - - /** Action text */ - public static final StringProperty ACTION = new StringProperty( - TABLE, "action"); - - /** Action code */ - public static final StringProperty ACTION_CODE = new StringProperty( - TABLE, "actionCode"); - - /** Message */ - public static final StringProperty MESSAGE = new StringProperty( - TABLE, "message"); - - /** Target Object Name */ - public static final StringProperty TARGET_NAME = new StringProperty( - TABLE, "targetName"); - - /** From User Object (JSON) */ - public static final StringProperty PICTURE = new StringProperty( - TABLE, "picture"); - - /** List of all properties for this model */ - public static final Property[] PROPERTIES = generateProperties(Update.class); - - // --- defaults - - /** Default values container */ - private static final ContentValues defaultValues = new ContentValues(); - - @Override - public ContentValues getDefaultValues() { - return defaultValues; - } - - static { - defaultValues.put(REMOTE_ID.name, 0); - defaultValues.put(TASK.name, 0); - defaultValues.put(TASK_LOCAL.name, 0); - defaultValues.put(TAGS.name, ""); - defaultValues.put(TAGS_LOCAL.name, 0); - defaultValues.put(USER_ID.name, 0); - defaultValues.put(USER.name, ""); - defaultValues.put(OTHER_USER_ID.name, 0); - defaultValues.put(OTHER_USER.name, ""); - defaultValues.put(ACTION.name, ""); - defaultValues.put(ACTION_CODE.name, ""); - defaultValues.put(MESSAGE.name, ""); - defaultValues.put(TARGET_NAME.name, ""); - defaultValues.put(PICTURE.name, ""); - } - - // --- data access boilerplate - - public Update() { - super(); - } - - public Update(TodorooCursor cursor) { - this(); - readPropertiesFromCursor(cursor); - } - - @Override - public long getId() { - return getIdHelper(ID); - } - - // --- parcelable helpers - - private static final Creator CREATOR = new ModelCreator<>(Update.class); -} diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/Database.java b/astrid/src/main/java/com/todoroo/astrid/dao/Database.java index 241883d6f..729277d63 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/Database.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/Database.java @@ -21,7 +21,6 @@ import com.todoroo.astrid.data.TagMetadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskListMetadata; -import com.todoroo.astrid.data.Update; import com.todoroo.astrid.data.UserActivity; import com.todoroo.astrid.provider.Astrid2TaskProvider; import com.todoroo.astrid.provider.Astrid3ContentProvider; @@ -57,7 +56,6 @@ public class Database extends AbstractDatabase { Metadata.TABLE, StoreObject.TABLE, TagData.TABLE, - Update.TABLE, UserActivity.TABLE, TagMetadata.TABLE, TaskAttachment.TABLE, @@ -172,12 +170,7 @@ public class Database extends AbstractDatabase { // not needed anymore } case 9: try { - database.execSQL(createTableSql(visitor, Update.TABLE.name, Update.PROPERTIES)); - onCreateTables(); - - Property[] properties = new Property[] { Task.UUID, - Task.USER_ID }; - + Property[] properties = new Property[] { Task.UUID, Task.USER_ID }; for(Property property : properties) { database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " + property.accept(visitor, null) + " DEFAULT 0"); @@ -191,12 +184,7 @@ public class Database extends AbstractDatabase { } catch (SQLiteException e) { Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); } - case 12: try { - database.execSQL("ALTER TABLE " + Update.TABLE.name + " ADD " + - Update.TAGS.accept(visitor, null)); - } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); - } + case 12: case 13: try { database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " + TagData.MEMBERS.accept(visitor, null)); @@ -237,19 +225,7 @@ public class Database extends AbstractDatabase { } catch (SQLiteException e) { Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); } - case 19: try { - for(Property property : new Property[] { Update.TASK_LOCAL, Update.TAGS_LOCAL }) { - database.execSQL("ALTER TABLE " + Update.TABLE.name + " ADD " + - property.accept(visitor, null)); - } - database.execSQL("CREATE INDEX IF NOT EXISTS up_tid ON " + - Update.TABLE + "(" + Update.TASK_LOCAL.name + ")"); - database.execSQL("CREATE INDEX IF NOT EXISTS up_tid ON " + - Update.TABLE + "(" + Update.TAGS_LOCAL.name + ")"); - - } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); - } + case 19: case 20: try { String tasks = Task.TABLE.name; String id = Task.ID.name; @@ -269,16 +245,7 @@ public class Database extends AbstractDatabase { } catch (SQLiteException e) { Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); } - case 21: try { - for(Property property : new Property[] { Update.OTHER_USER_ID, Update.OTHER_USER }) { - database.execSQL("ALTER TABLE " + Update.TABLE.name + " ADD " + - property.accept(visitor, null)); - } - - } - catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); - } + case 21: case 22: case 23: case 24: try {