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

Use string properties for user id in the api project

Browse Source
pull/14/head
Sam Bosley 12 years ago
parent 53698cdb02
commit f20cfe1360
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -29,7 +29,7 @@ abstract public class RemoteModel extends AbstractModel {
protected static final String USER_ID_PROPERTY_NAME = "userId"; //$NON-NLS-1$ protected static final String USER_ID_PROPERTY_NAME = "userId"; //$NON-NLS-1$
/** user id property */ /** user id property */
public static final LongProperty USER_ID_PROPERTY = new LongProperty(null, USER_ID_PROPERTY_NAME); public static final StringProperty USER_ID_PROPERTY = new StringProperty(null, USER_ID_PROPERTY_NAME);
/** user json property common to all remote models */ /** user json property common to all remote models */
protected static final String USER_JSON_PROPERTY_NAME = "user"; //$NON-NLS-1$ protected static final String USER_JSON_PROPERTY_NAME = "user"; //$NON-NLS-1$

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

@ -46,7 +46,7 @@ public final class TagData extends RemoteModel {
TABLE, ID_PROPERTY_NAME); TABLE, ID_PROPERTY_NAME);
/** User id */ /** User id */
public static final LongProperty USER_ID = new LongProperty( public static final StringProperty USER_ID = new StringProperty(
TABLE, USER_ID_PROPERTY_NAME, Property.PROP_FLAG_USER_ID); TABLE, USER_ID_PROPERTY_NAME, Property.PROP_FLAG_USER_ID);
/** User Object (JSON) */ /** User Object (JSON) */
@ -149,7 +149,7 @@ public final class TagData extends RemoteModel {
private static final ContentValues defaultValues = new ContentValues(); private static final ContentValues defaultValues = new ContentValues();
static { static {
defaultValues.put(USER_ID.name, 0); defaultValues.put(USER_ID.name, "0");
defaultValues.put(USER.name, "{}"); defaultValues.put(USER.name, "{}");
defaultValues.put(REMOTE_ID.name, 0); defaultValues.put(REMOTE_ID.name, 0);
defaultValues.put(UUID.name, NO_UUID); defaultValues.put(UUID.name, NO_UUID);

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

@ -158,7 +158,7 @@ public final class Task extends RemoteModel {
TABLE, REMOTE_ID_PROPERTY_NAME, Property.PROP_FLAG_NULLABLE); TABLE, REMOTE_ID_PROPERTY_NAME, Property.PROP_FLAG_NULLABLE);
/** Assigned user id */ /** Assigned user id */
public static final LongProperty USER_ID = new LongProperty( public static final StringProperty USER_ID = new StringProperty(
TABLE, USER_ID_PROPERTY_NAME, Property.PROP_FLAG_USER_ID); TABLE, USER_ID_PROPERTY_NAME, Property.PROP_FLAG_USER_ID);
/** User Object (JSON) */ /** User Object (JSON) */
@ -201,16 +201,16 @@ public final class Task extends RemoteModel {
// --- user id special values // --- user id special values
/** user id = doesn't exist/ignore it. For filtering in tags */ /** user id = doesn't exist/ignore it. For filtering in tags */
public static final long USER_ID_IGNORE = -3L; public static final String USER_ID_IGNORE = "-3";
/** user id = read user email value */ /** user id = read user email value */
public static final long USER_ID_EMAIL = -2L; public static final String USER_ID_EMAIL = "-2";
/** user id = unassigned */ /** user id = unassigned */
public static final long USER_ID_UNASSIGNED = -1L; public static final String USER_ID_UNASSIGNED = "-1";
/** user id = myself */ /** user id = myself */
public static final long USER_ID_SELF = 0L; public static final String USER_ID_SELF = "0";
// --- notification flags // --- notification flags
@ -293,7 +293,7 @@ public final class Task extends RemoteModel {
defaultValues.put(LAST_SYNC.name, 0); defaultValues.put(LAST_SYNC.name, 0);
defaultValues.putNull(REMOTE_ID.name); defaultValues.putNull(REMOTE_ID.name);
defaultValues.put(UUID.name, NO_UUID); defaultValues.put(UUID.name, NO_UUID);
defaultValues.put(USER_ID.name, 0); defaultValues.put(USER_ID.name, "0");
defaultValues.put(CREATOR_ID.name, 0); defaultValues.put(CREATOR_ID.name, 0);
defaultValues.put(USER.name, "{}"); defaultValues.put(USER.name, "{}");
defaultValues.put(SHARED_WITH.name, "{}"); defaultValues.put(SHARED_WITH.name, "{}");
@ -506,7 +506,7 @@ public final class Task extends RemoteModel {
public boolean isEditable() { public boolean isEditable() {
return (getValue(Task.IS_READONLY) == 0) && return (getValue(Task.IS_READONLY) == 0) &&
!(getValue(Task.IS_PUBLIC) == 1 && getValue(Task.USER_ID) != Task.USER_ID_SELF); !(getValue(Task.IS_PUBLIC) == 1 && !Task.USER_ID_SELF.equals(getValue(Task.USER_ID)));
} }
public boolean repeatAfterCompletion() { public boolean repeatAfterCompletion() {

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

@ -67,7 +67,7 @@ public class Update extends RemoteModel {
TABLE, "tagsLocal"); TABLE, "tagsLocal");
/** From user id */ /** From user id */
public static final LongProperty USER_ID = new LongProperty( public static final StringProperty USER_ID = new StringProperty(
TABLE, USER_ID_PROPERTY_NAME); TABLE, USER_ID_PROPERTY_NAME);
/** From User Object (JSON) */ /** From User Object (JSON) */
@ -75,7 +75,7 @@ public class Update extends RemoteModel {
TABLE, USER_JSON_PROPERTY_NAME); TABLE, USER_JSON_PROPERTY_NAME);
/** Other user id */ /** Other user id */
public static final LongProperty OTHER_USER_ID = new LongProperty( public static final StringProperty OTHER_USER_ID = new StringProperty(
TABLE, "other_user_id"); TABLE, "other_user_id");
/** Other User Object (JSON) */ /** Other User Object (JSON) */
@ -139,9 +139,9 @@ public class Update extends RemoteModel {
defaultValues.put(TASK_LOCAL.name, 0); defaultValues.put(TASK_LOCAL.name, 0);
defaultValues.put(TAGS.name, ""); defaultValues.put(TAGS.name, "");
defaultValues.put(TAGS_LOCAL.name, 0); defaultValues.put(TAGS_LOCAL.name, 0);
defaultValues.put(USER_ID.name, 0); defaultValues.put(USER_ID.name, "0");
defaultValues.put(USER.name, ""); defaultValues.put(USER.name, "");
defaultValues.put(OTHER_USER_ID.name, 0); defaultValues.put(OTHER_USER_ID.name, "0");
defaultValues.put(OTHER_USER.name, ""); defaultValues.put(OTHER_USER.name, "");
defaultValues.put(ACTION.name, ""); defaultValues.put(ACTION.name, "");
defaultValues.put(ACTION_CODE.name, ""); defaultValues.put(ACTION_CODE.name, "");

Write Preview
Loading…
Cancel
Save