archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename/change type of old remote_id properties to repurpose as UUIDS

Browse Source
pull/14/head
Sam Bosley 12 years ago
parent f9d595b3e7
commit 0db2ff6089
6 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File

10
api/src/com/todoroo/astrid/data/RemoteModel.java
Unescape Escape View File

@ -24,10 +24,10 @@ import com.todoroo.andlib.data.TodorooCursor;
abstract public class RemoteModel extends AbstractModel {
/** remote id property common to all remote models */
public static final String REMOTE_ID_PROPERTY_NAME = "remoteId"; //$NON-NLS-1$
public static final String UUID_PROPERTY_NAME = "remoteId"; //$NON-NLS-1$
/** remote id property */
public static final LongProperty REMOTE_ID_PROPERTY = new LongProperty(null, REMOTE_ID_PROPERTY_NAME);
public static final StringProperty UUID_PROPERTY = new StringProperty(null, UUID_PROPERTY_NAME);
/** user id property common to all remote models */
protected static final String USER_ID_PROPERTY_NAME = "userId"; //$NON-NLS-1$
@ -47,12 +47,6 @@ abstract public class RemoteModel extends AbstractModel {
/** pushed at date property name */
public static final LongProperty PUSHED_AT_PROPERTY = new LongProperty(null, PUSHED_AT_PROPERTY_NAME);
/** new uuid property */
public static final String UUID_PROPERTY_NAME = "uuid"; //$NON-NLS-1$
/** new uuid property */
public static final StringProperty UUID_PROPERTY = new StringProperty(null, UUID_PROPERTY_NAME);
/** constant value for no uuid */
public static final String NO_UUID = "0"; //$NON-NLS-1$

9
api/src/com/todoroo/astrid/data/TagData.java
Unescape Escape View File

@ -54,8 +54,8 @@ public final class TagData extends RemoteModel {
TABLE, USER_JSON_PROPERTY_NAME);
/** Remote goal id */
public static final LongProperty REMOTE_ID = new LongProperty(
TABLE, REMOTE_ID_PROPERTY_NAME);
public static final StringProperty UUID = new StringProperty(
TABLE, UUID_PROPERTY_NAME);
/** Name of Tag */
public static final StringProperty NAME = new StringProperty(
@ -121,10 +121,6 @@ public final class TagData extends RemoteModel {
public static final LongProperty PUSHED_AT = new LongProperty(
TABLE, PUSHED_AT_PROPERTY_NAME, Property.PROP_FLAG_DATE);
/** UUID */
public static final StringProperty UUID = new StringProperty(
TABLE, UUID_PROPERTY_NAME);
/** Tag ordering */
public static final StringProperty TAG_ORDERING = new StringProperty(
TABLE, "tagOrdering");
@ -151,7 +147,6 @@ public final class TagData extends RemoteModel {
static {
defaultValues.put(USER_ID.name, "0");
defaultValues.put(USER.name, "");
defaultValues.put(REMOTE_ID.name, 0);
defaultValues.put(UUID.name, NO_UUID);
defaultValues.put(NAME.name, "");
defaultValues.put(PICTURE.name, "");

9
api/src/com/todoroo/astrid/data/Task.java
Unescape Escape View File

@ -154,8 +154,8 @@ public final class Task extends RemoteModel {
// --- for astrid.com
/** Remote id */
public static final LongProperty REMOTE_ID = new LongProperty(
TABLE, REMOTE_ID_PROPERTY_NAME, Property.PROP_FLAG_NULLABLE);
public static final StringProperty UUID = new StringProperty(
TABLE, UUID_PROPERTY_NAME, Property.PROP_FLAG_NULLABLE);
/** Assigned user id */
public static final StringProperty USER_ID = new StringProperty(
@ -181,10 +181,6 @@ public final class Task extends RemoteModel {
public static final LongProperty PUSHED_AT = new LongProperty(
TABLE, PUSHED_AT_PROPERTY_NAME, Property.PROP_FLAG_DATE);
/** UUID */
public static final StringProperty UUID = new StringProperty(
TABLE, UUID_PROPERTY_NAME, Property.PROP_FLAG_NULLABLE);
/** List of all properties for this model */
public static final Property<?>[] PROPERTIES = generateProperties(Task.class);
@ -301,7 +297,6 @@ public final class Task extends RemoteModel {
defaultValues.put(CLASSIFICATION.name, "");
defaultValues.put(LAST_SYNC.name, 0);
defaultValues.putNull(REMOTE_ID.name);
defaultValues.put(UUID.name, NO_UUID);
defaultValues.put(USER_ID.name, "0");
defaultValues.put(CREATOR_ID.name, 0);

4
api/src/com/todoroo/astrid/data/TaskApiDao.java
Unescape Escape View File

@ -145,8 +145,8 @@ public class TaskApiDao extends ContentResolverDao<Task> {
try {
return super.save(model);
} catch (SQLException e) {
if (model.containsNonNullValue(Task.REMOTE_ID)) {
TodorooCursor<Task> cursor = query(Query.select(Task.ID).where(Task.REMOTE_ID.eq(model.getValue(Task.REMOTE_ID))));
if (model.containsNonNullValue(Task.UUID)) {
TodorooCursor<Task> cursor = query(Query.select(Task.ID).where(Task.UUID.eq(model.getValue(Task.UUID))));
if (cursor.getCount() > 0) {
cursor.moveToFirst();
model.setId(cursor.get(Task.ID));

9
api/src/com/todoroo/astrid/data/Update.java
Unescape Escape View File

@ -42,8 +42,8 @@ public class Update extends RemoteModel {
TABLE, ID_PROPERTY_NAME);
/** Remote ID */
public static final LongProperty REMOTE_ID = new LongProperty(
TABLE, REMOTE_ID_PROPERTY_NAME);
public static final StringProperty UUID = new StringProperty(
TABLE, UUID_PROPERTY_NAME);
/** Associated Task remote-id (if any) */
@Deprecated // We changed uuids to strings
@ -110,10 +110,6 @@ public class Update extends RemoteModel {
public static final LongProperty PUSHED_AT = new LongProperty(
TABLE, PUSHED_AT_PROPERTY_NAME);
/** UUID */
public static final StringProperty UUID = new StringProperty(
TABLE, UUID_PROPERTY_NAME);
/** List of all properties for this model */
public static final Property<?>[] PROPERTIES = generateProperties(Update.class);
@ -132,7 +128,6 @@ public class Update extends RemoteModel {
}
static {
defaultValues.put(REMOTE_ID.name, 0);
defaultValues.put(UUID.name, NO_UUID);
defaultValues.put(TASK.name, 0);
defaultValues.put(TASK_UUID.name, NO_UUID);

4
api/src/com/todoroo/astrid/data/User.java
Unescape Escape View File

@ -63,10 +63,6 @@ public final class User extends RemoteModel {
TABLE, "picture");
/** Remote id */
public static final LongProperty REMOTE_ID = new LongProperty(
TABLE, REMOTE_ID_PROPERTY_NAME);
/** UUID */
public static final StringProperty UUID = new StringProperty(
TABLE, UUID_PROPERTY_NAME);

Write Preview
Loading…
Cancel
Save