diff --git a/api/src/com/todoroo/astrid/data/WaitingOnMe.java b/api/src/com/todoroo/astrid/data/WaitingOnMe.java deleted file mode 100644 index a1b0e39db..000000000 --- a/api/src/com/todoroo/astrid/data/WaitingOnMe.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.todoroo.astrid.data; - -import android.content.ContentValues; -import android.net.Uri; - -import com.todoroo.andlib.data.AbstractModel; -import com.todoroo.andlib.data.Property; -import com.todoroo.andlib.data.Property.IntegerProperty; -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; -import com.todoroo.astrid.api.AstridApiConstants; - -public class WaitingOnMe extends RemoteModel { - - /** table for this model */ - public static final Table TABLE = new Table("waitingOnMe", WaitingOnMe.class); - - /** model class for entries in the outstanding table */ - public static final Class> OUTSTANDING_MODEL = WaitingOnMeOutstanding.class; - - /** content uri for this model */ - public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" + - TABLE.name); - - /** ID */ - public static final LongProperty ID = new LongProperty( - TABLE, ID_PROPERTY_NAME); - - /** Remote ID */ - public static final StringProperty UUID = new StringProperty( - TABLE, RemoteModel.UUID_PROPERTY_NAME); - - public static final StringProperty WAITING_USER_ID = new StringProperty( - TABLE, "waiting_user_id", Property.PROP_FLAG_USER_ID); - - public static final StringProperty TASK_UUID = new StringProperty( - TABLE, "task_uuid"); - - public static final StringProperty WAIT_TYPE = new StringProperty( - TABLE, "wait_type"); - - public static final LongProperty CREATED_AT = new LongProperty( - TABLE, "created_at", Property.PROP_FLAG_DATE); - - public static final LongProperty DELETED_AT = new LongProperty( - TABLE, "deleted_at", Property.PROP_FLAG_DATE); - - public static final LongProperty READ_AT = new LongProperty( - TABLE, "read_at", Property.PROP_FLAG_DATE); - - public static final IntegerProperty ACKNOWLEDGED = new IntegerProperty( - TABLE, "acknowledged", Property.PROP_FLAG_BOOLEAN); - - public static final LongProperty PUSHED_AT = new LongProperty( - TABLE, PUSHED_AT_PROPERTY_NAME, Property.PROP_FLAG_DATE); - - @Override - public String getUuid() { - return getUuidHelper(UUID); - } - - public WaitingOnMe() { - super(); - } - - public WaitingOnMe(TodorooCursor cursor) { - this(); - readPropertiesFromCursor(cursor); - } - - public void readFromCursor(TodorooCursor cursor) { - super.readPropertiesFromCursor(cursor); - } - - private static final ContentValues defaultValues = new ContentValues(); - - static { - defaultValues.put(UUID.name, RemoteModel.NO_UUID); - defaultValues.put(WAITING_USER_ID.name, RemoteModel.NO_UUID); - defaultValues.put(TASK_UUID.name, RemoteModel.NO_UUID); - defaultValues.put(CREATED_AT.name, 0L); - defaultValues.put(DELETED_AT.name, 0L); - defaultValues.put(READ_AT.name, 0L); - } - - public static final String WAIT_TYPE_COMMENTED = "commented"; - public static final String WAIT_TYPE_ASSIGNED = "assigned"; - public static final String WAIT_TYPE_MENTIONED = "mentioned"; - public static final String WAIT_TYPE_RAISED_PRI = "raised_pri"; - public static final String WAIT_TYPE_CHANGED_DUE = "changed_due"; - - @Override - public ContentValues getDefaultValues() { - return defaultValues; - } - - @Override - public long getId() { - return getIdHelper(ID); - } - - public static final Property[] PROPERTIES = generateProperties(WaitingOnMe.class); - - private static final Creator CREATOR = new ModelCreator(WaitingOnMe.class); - - @Override - protected Creator getCreator() { - return CREATOR; - } - -} diff --git a/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java b/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java deleted file mode 100644 index 6fa56d73b..000000000 --- a/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.todoroo.astrid.data; - -import android.content.ContentValues; - -import com.todoroo.andlib.data.AbstractModel; -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; - -public class WaitingOnMeOutstanding extends OutstandingEntry { - - /** table for this model */ - public static final Table TABLE = new Table("waiting_on_me_outstanding", WaitingOnMeOutstanding.class); - - // --- properties - - /** ID */ - public static final LongProperty ID = new LongProperty( - TABLE, ID_PROPERTY_NAME); - - public static final LongProperty TASK_ID = new LongProperty( - TABLE, ENTITY_ID_PROPERTY_NAME); - - public static final StringProperty COLUMN_STRING = new StringProperty( - TABLE, COLUMN_STRING_PROPERTY_NAME); - - public static final StringProperty VALUE_STRING = new StringProperty( - TABLE, VALUE_STRING_PROPERTY_NAME); - - public static final LongProperty CREATED_AT = new LongProperty( - TABLE, CREATED_AT_PROPERTY_NAME); - - private static final ContentValues defaultValues = new ContentValues(); - - static { - defaultValues.put(TASK_ID.name, 0); - defaultValues.put(COLUMN_STRING.name, ""); - defaultValues.put(VALUE_STRING.name, ""); - } - - /** List of all properties for this model */ - public static final Property[] PROPERTIES = generateProperties(WaitingOnMeOutstanding.class); - - @Override - public ContentValues getDefaultValues() { - return defaultValues; - } - - @Override - public long getId() { - return getIdHelper(ID); - } - - public static final Creator CREATOR = new ModelCreator(WaitingOnMeOutstanding.class); - - @Override - protected Creator getCreator() { - return CREATOR; - } - -} diff --git a/astrid/res/drawable/waiting_on_me.png b/astrid/res/drawable/waiting_on_me.png deleted file mode 100644 index e89e65ed1..000000000 Binary files a/astrid/res/drawable/waiting_on_me.png and /dev/null differ diff --git a/astrid/res/drawable/waiting_on_me_dark.png b/astrid/res/drawable/waiting_on_me_dark.png deleted file mode 100644 index 0041dc991..000000000 Binary files a/astrid/res/drawable/waiting_on_me_dark.png and /dev/null differ diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml index 66db8335d..bca167c74 100644 --- a/astrid/res/layout/task_edit_activity.xml +++ b/astrid/res/layout/task_edit_activity.xml @@ -24,54 +24,6 @@ android:orientation="vertical" android:gravity="center_horizontal" android:padding="10dip" > - - - - - - - - - - - - diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index 163b5b08c..0b09d643a 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -940,18 +940,6 @@ Select tasks to view... - - - %s commented on your task. - %s mentioned you. - %s assigned this to you. - %s raised the priority. - %s changed the due date. - %s wants your attention. - - Dismiss - I\'ve read this - diff --git a/astrid/res/values/strings-filters.xml b/astrid/res/values/strings-filters.xml index 9bc5c37ac..407a81885 100644 --- a/astrid/res/values/strings-filters.xml +++ b/astrid/res/values/strings-filters.xml @@ -13,9 +13,6 @@ My Tasks - - Waiting On Me - diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index 6425732c0..333214745 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -28,7 +28,6 @@ @null #101010 @drawable/task_edit_background - @drawable/task_edit_background @drawable/custom_tab_indicator_dark @drawable/menu_button_blue @drawable/people_menu_button_blue @@ -78,7 +77,6 @@ #22000000 #33272327 @drawable/task_edit_background_transparent_black - @drawable/task_edit_background_transparent_black @android:color/transparent @android:color/transparent @@ -102,7 +100,6 @@ @drawable/plus_button_red @drawable/mic_button_red @drawable/task_edit_background_white - @drawable/wom_edit_background_white @drawable/custom_tab_indicator @drawable/menu_button_red @drawable/people_menu_button_red @@ -185,7 +182,6 @@ #22000000 #33272327 @drawable/task_edit_background_transparent_black - @drawable/task_edit_background_transparent_black @android:color/transparent @style/AstridV11ActionBarStyle.White.Blue.Transparent @style/AstridActionBarStyle.White.Blue.Transparent diff --git a/astrid/src/com/todoroo/astrid/actfm/WaitingOnMeFragment.java b/astrid/src/com/todoroo/astrid/actfm/WaitingOnMeFragment.java deleted file mode 100644 index b3599ac9b..000000000 --- a/astrid/src/com/todoroo/astrid/actfm/WaitingOnMeFragment.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.todoroo.astrid.actfm; - -import java.util.concurrent.atomic.AtomicReference; - -import android.database.Cursor; -import android.graphics.Typeface; -import android.text.TextUtils; -import android.widget.TextView; - -import com.todoroo.andlib.data.Property; -import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.andlib.service.Autowired; -import com.todoroo.andlib.sql.Criterion; -import com.todoroo.andlib.sql.Query; -import com.todoroo.andlib.utility.AndroidUtilities; -import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.astrid.activity.TaskListFragment; -import com.todoroo.astrid.adapter.TaskAdapter; -import com.todoroo.astrid.adapter.TaskAdapter.OnCompletedTaskListener; -import com.todoroo.astrid.dao.TaskDao; -import com.todoroo.astrid.dao.WaitingOnMeDao; -import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.data.WaitingOnMe; - -public class WaitingOnMeFragment extends TaskListFragment { - - @Autowired - private WaitingOnMeDao waitingOnMeDao; - - @Autowired - private TaskDao taskDao; - - @Override - public Property[] taskProperties() { - return AndroidUtilities.addToArray(Property.class, super.taskProperties(), WaitingOnMe.READ_AT, WaitingOnMe.ACKNOWLEDGED); - } - - @Override - protected TaskAdapter createTaskAdapter(TodorooCursor cursor) { - return new WaitingOnMeTaskAdapter(this, getTaskRowResource(), - cursor, sqlQueryTemplate, false, - new OnCompletedTaskListener() { - @Override - public void onCompletedTask(Task item, boolean newState) { - if (newState == true) { - onTaskCompleted(item); - } - } - }); - } - - private static class WaitingOnMeTaskAdapter extends TaskAdapter { - - public WaitingOnMeTaskAdapter(TaskListFragment fragment, int resource, - Cursor c, AtomicReference query, boolean autoRequery, - OnCompletedTaskListener onCompletedTaskListener) { - super(fragment, resource, c, query, autoRequery, onCompletedTaskListener); - } - - @Override - protected void setTaskAppearance(ViewHolder viewHolder, Task task) { - super.setTaskAppearance(viewHolder, task); - - TextView nameView = viewHolder.nameView; - if (task.getValue(WaitingOnMe.READ_AT) == 0 && task.getValue(WaitingOnMe.ACKNOWLEDGED) == 0) { - nameView.setTypeface(null, Typeface.BOLD); - } else { - nameView.setTypeface(null, 0); - } - } - - } - - @Override - public void onTaskListItemClicked(long taskId, boolean editable) { - super.onTaskListItemClicked(taskId, editable); - String uuid = taskDao.uuidFromLocalId(taskId); - if (!TextUtils.isEmpty(uuid)) { - TodorooCursor womCursor = waitingOnMeDao.query(Query.select(WaitingOnMe.ID) - .where(Criterion.and(WaitingOnMe.TASK_UUID.eq(uuid), WaitingOnMe.READ_AT.eq(0)))); - try { - if (womCursor.getCount() > 0) { - womCursor.moveToFirst(); - WaitingOnMe wom = new WaitingOnMe(womCursor); - wom.setValue(WaitingOnMe.READ_AT, DateUtilities.now()); - waitingOnMeDao.saveExisting(wom); - } - } finally { - womCursor.close(); - } - } - } - -} diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java index 9a2bbafb2..3f3e21b71 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java @@ -58,8 +58,6 @@ import com.todoroo.astrid.dao.TaskListMetadataOutstandingDao; import com.todoroo.astrid.dao.TaskOutstandingDao; import com.todoroo.astrid.dao.UserActivityDao; import com.todoroo.astrid.dao.UserActivityOutstandingDao; -import com.todoroo.astrid.dao.WaitingOnMeDao; -import com.todoroo.astrid.dao.WaitingOnMeOutstandingDao; import com.todoroo.astrid.data.OutstandingEntry; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.TagData; @@ -71,7 +69,6 @@ import com.todoroo.astrid.data.TaskListMetadataOutstanding; import com.todoroo.astrid.data.TaskOutstanding; import com.todoroo.astrid.data.User; import com.todoroo.astrid.data.UserActivity; -import com.todoroo.astrid.data.WaitingOnMe; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.widget.TasksWidget; @@ -114,12 +111,6 @@ public class ActFmSyncThread { @Autowired private TaskListMetadataOutstandingDao taskListMetadataOutstandingDao; - @Autowired - private WaitingOnMeDao waitingOnMeDao; - - @Autowired - private WaitingOnMeOutstandingDao waitingOnMeOutstandingDao; - private String token; private boolean syncMigration = false; @@ -140,8 +131,7 @@ public class ActFmSyncThread { TYPE_TAG, TYPE_ACTIVITY, TYPE_ATTACHMENT, - TYPE_TASK_LIST_METADATA, - TYPE_WAITING_ON_ME + TYPE_TASK_LIST_METADATA } private static volatile ActFmSyncThread instance; @@ -151,7 +141,7 @@ public class ActFmSyncThread { synchronized(ActFmSyncThread.class) { if (instance == null) { initializeSyncComponents(PluginServices.getTaskDao(), PluginServices.getTagDataDao(), PluginServices.getUserActivityDao(), - PluginServices.getTaskAttachmentDao(), PluginServices.getTaskListMetadataDao(), PluginServices.getWaitingOnMeDao()); + PluginServices.getTaskAttachmentDao(), PluginServices.getTaskListMetadataDao()); } } } @@ -159,7 +149,7 @@ public class ActFmSyncThread { } public static ActFmSyncThread initializeSyncComponents(TaskDao taskDao, TagDataDao tagDataDao, UserActivityDao userActivityDao, - TaskAttachmentDao taskAttachmentDao, TaskListMetadataDao taskListMetadataDao, WaitingOnMeDao waitingOnMeDao) { + TaskAttachmentDao taskAttachmentDao, TaskListMetadataDao taskListMetadataDao) { if (instance == null) { synchronized(ActFmSyncThread.class) { if (instance == null) { @@ -174,7 +164,6 @@ public class ActFmSyncThread { userActivityDao.addListener(new SyncDatabaseListener(instance, ModelType.TYPE_ACTIVITY)); taskAttachmentDao.addListener(new SyncDatabaseListener(instance, ModelType.TYPE_ATTACHMENT)); taskListMetadataDao.addListener(new TaskListMetadataSyncDatabaseListener(instance, waitingPool, ModelType.TYPE_TASK_LIST_METADATA)); - waitingOnMeDao.addListener(new SyncDatabaseListener(instance, ModelType.TYPE_WAITING_ON_ME)); instance.startSyncThread(); } @@ -206,7 +195,7 @@ public class ActFmSyncThread { public static void clearTablePushedAtValues() { String[] pushedAtPrefs = new String[] { NameMaps.PUSHED_AT_TASKS, NameMaps.PUSHED_AT_TAGS, NameMaps.PUSHED_AT_ACTIVITY, - NameMaps.PUSHED_AT_USERS, NameMaps.PUSHED_AT_TASK_LIST_METADATA, NameMaps.PUSHED_AT_WAITING_ON_ME }; + NameMaps.PUSHED_AT_USERS, NameMaps.PUSHED_AT_TASK_LIST_METADATA}; for (String key : pushedAtPrefs) { Preferences.clear(key); } @@ -278,7 +267,6 @@ public class ActFmSyncThread { enqueueMessage(BriefMe.instantiateBriefMeForClass(Task.class, NameMaps.PUSHED_AT_TASKS), DEFAULT_REFRESH_RUNNABLE); enqueueMessage(BriefMe.instantiateBriefMeForClass(TagData.class, NameMaps.PUSHED_AT_TAGS), DEFAULT_REFRESH_RUNNABLE); enqueueMessage(BriefMe.instantiateBriefMeForClass(User.class, NameMaps.PUSHED_AT_USERS), DEFAULT_REFRESH_RUNNABLE); - enqueueMessage(BriefMe.instantiateBriefMeForClass(WaitingOnMe.class, NameMaps.PUSHED_AT_WAITING_ON_ME), DEFAULT_REFRESH_RUNNABLE); setTimeForBackgroundSync(false); } @@ -454,7 +442,6 @@ public class ActFmSyncThread { constructChangesHappenedFromOutstandingTable(Task.class, taskDao, taskOutstandingDao); constructChangesHappenedFromOutstandingTable(TagData.class, tagDataDao, tagOutstandingDao); constructChangesHappenedFromOutstandingTable(UserActivity.class, userActivityDao, userActivityOutstandingDao); - constructChangesHappenedFromOutstandingTable(WaitingOnMe.class, waitingOnMeDao, waitingOnMeOutstandingDao); constructChangesHappenedForTaskListMetadata(taskListMetadataDao, taskListMetadataOutstandingDao); } diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java b/astrid/src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java index e819f5981..bf309964f 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java @@ -31,8 +31,6 @@ public class AcknowledgeChange extends ServerToClientMessage { dao = PluginServices.getTaskAttachmentOutstandingDao(); } else if (NameMaps.TABLE_ID_TASK_LIST_METADATA.equals(table)) { dao = PluginServices.getTaskListMetadataOutstandingDao(); - } else if (NameMaps.TABLE_ID_WAITING_ON_ME.equals(table)) { - dao = PluginServices.getWaitingOnMeOutstandingDao(); } else { dao = null; } diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java b/astrid/src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java index 91ada58e8..1c5950fa7 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java @@ -37,8 +37,6 @@ import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.TaskOutstanding; import com.todoroo.astrid.data.UserActivity; import com.todoroo.astrid.data.UserActivityOutstanding; -import com.todoroo.astrid.data.WaitingOnMe; -import com.todoroo.astrid.data.WaitingOnMeOutstanding; public class ChangesHappened> extends ClientToServerMessage { @@ -67,9 +65,6 @@ public class ChangesHappened(id, WaitingOnMe.class, - PluginServices.getWaitingOnMeDao(), PluginServices.getWaitingOnMeOutstandingDao()); default: return null; } diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ConvertSelfUserIdsToZero.java b/astrid/src/com/todoroo/astrid/actfm/sync/messages/ConvertSelfUserIdsToZero.java index 5921b024d..c01f1138e 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ConvertSelfUserIdsToZero.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/messages/ConvertSelfUserIdsToZero.java @@ -10,14 +10,12 @@ import com.todoroo.astrid.dao.HistoryDao; import com.todoroo.astrid.dao.TagDataDao; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.UserActivityDao; -import com.todoroo.astrid.dao.WaitingOnMeDao; import com.todoroo.astrid.data.History; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.SyncFlags; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.UserActivity; -import com.todoroo.astrid.data.WaitingOnMe; public class ConvertSelfUserIdsToZero { @@ -33,9 +31,6 @@ public class ConvertSelfUserIdsToZero { @Autowired private UserActivityDao userActivityDao; - @Autowired - private WaitingOnMeDao waitingOnMeDao; - public ConvertSelfUserIdsToZero() { DependencyInjectionService.getInstance().inject(this); } @@ -47,7 +42,6 @@ public class ConvertSelfUserIdsToZero { updateDatabase(tagDataDao, new TagData(), TagData.USER_ID, selfId); updateDatabase(historyDao, new History(), History.USER_UUID, selfId); updateDatabase(userActivityDao, new UserActivity(), UserActivity.USER_UUID, selfId); - updateDatabase(waitingOnMeDao, new WaitingOnMe(), WaitingOnMe.WAITING_USER_ID, selfId); } } diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java b/astrid/src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java index 607d4f6b6..6f02894ed 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java @@ -15,7 +15,6 @@ import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.User; import com.todoroo.astrid.data.UserActivity; -import com.todoroo.astrid.data.WaitingOnMe; public class NameMaps { @@ -33,7 +32,6 @@ public class NameMaps { public static final String TABLE_ID_HISTORY = "history"; public static final String TABLE_ID_ATTACHMENTS = "task_attachments"; public static final String TABLE_ID_TASK_LIST_METADATA = "task_list_metadata"; - public static final String TABLE_ID_WAITING_ON_ME = "waiting_on_mes"; private static final String PUSHED_AT_PREFIX = "pushed_at"; public static final String PUSHED_AT_TASKS = PUSHED_AT_PREFIX + "_" + TABLE_ID_TASKS; @@ -41,7 +39,6 @@ public class NameMaps { public static final String PUSHED_AT_USERS = PUSHED_AT_PREFIX + "_" + TABLE_ID_USERS; public static final String PUSHED_AT_ACTIVITY = PUSHED_AT_PREFIX + "_" + TABLE_ID_USER_ACTIVITY; public static final String PUSHED_AT_TASK_LIST_METADATA = PUSHED_AT_PREFIX + "_" + TABLE_ID_TASK_LIST_METADATA; - public static final String PUSHED_AT_WAITING_ON_ME = PUSHED_AT_PREFIX + "_" + TABLE_ID_WAITING_ON_ME; static { // Hardcoded local tables mapped to corresponding server names @@ -53,7 +50,6 @@ public class NameMaps { TABLE_LOCAL_TO_SERVER.put(UserActivity.TABLE, TABLE_ID_USER_ACTIVITY); TABLE_LOCAL_TO_SERVER.put(TaskAttachment.TABLE, TABLE_ID_ATTACHMENTS); TABLE_LOCAL_TO_SERVER.put(TaskListMetadata.TABLE, TABLE_ID_TASK_LIST_METADATA); - TABLE_LOCAL_TO_SERVER.put(WaitingOnMe.TABLE, TABLE_ID_WAITING_ON_ME); // Reverse the mapping to construct the server to local map TABLE_SERVER_TO_LOCAL = AndroidUtilities.reverseMap(TABLE_LOCAL_TO_SERVER); @@ -93,8 +89,6 @@ public class NameMaps { return computeSyncableProperties(TASK_ATTACHMENT_PROPERTIES_LOCAL_TO_SERVER.keySet(), TASK_ATTACHMENT_PROPERTIES_EXCLUDED); } else if (TABLE_ID_TASK_LIST_METADATA.equals(table)) { return computeSyncableProperties(TASK_LIST_METADATA_PROPERTIES_LOCAL_TO_SERVER.keySet(), TASK_LIST_METADATA_PROPERTIES_EXCLUDED); - } else if (TABLE_ID_WAITING_ON_ME.equals(table)) { - return computeSyncableProperties(WAITING_ON_ME_PROPERTIES_LOCAL_TO_SERVER.keySet(), WAITING_ON_ME_PROPERTIES_EXCLUDED); } return null; } @@ -332,46 +326,12 @@ public class NameMaps { TASK_LIST_METADATA_PROPERTIES_SERVER_TO_LOCAL = AndroidUtilities.reverseMap(TASK_LIST_METADATA_PROPERTIES_LOCAL_TO_SERVER); } - // ---------- - // WaitingOnMe - // ---------- - private static final Map, String> WAITING_ON_ME_PROPERTIES_LOCAL_TO_SERVER; - private static final Map> WAITING_ON_ME_COLUMN_NAMES_TO_PROPERTIES; - private static final Map WAITING_ON_ME_COLUMNS_LOCAL_TO_SERVER; - private static final Map> WAITING_ON_ME_PROPERTIES_SERVER_TO_LOCAL; - private static final Set WAITING_ON_ME_PROPERTIES_EXCLUDED; - - private static void putWaitingOnMePropertyToServerName(Property property, String serverName, boolean writeable) { - putPropertyToServerName(property, serverName, WAITING_ON_ME_PROPERTIES_LOCAL_TO_SERVER, WAITING_ON_ME_COLUMN_NAMES_TO_PROPERTIES, - WAITING_ON_ME_COLUMNS_LOCAL_TO_SERVER, WAITING_ON_ME_PROPERTIES_EXCLUDED, writeable); - } - - static { - WAITING_ON_ME_PROPERTIES_LOCAL_TO_SERVER = new HashMap, String>(); - WAITING_ON_ME_COLUMN_NAMES_TO_PROPERTIES = new HashMap>(); - WAITING_ON_ME_COLUMNS_LOCAL_TO_SERVER = new HashMap(); - WAITING_ON_ME_PROPERTIES_EXCLUDED = new HashSet(); - - putWaitingOnMePropertyToServerName(WaitingOnMe.UUID, "uuid", false); - putWaitingOnMePropertyToServerName(WaitingOnMe.WAITING_USER_ID, "waiting_user_id", false); - putWaitingOnMePropertyToServerName(WaitingOnMe.TASK_UUID, "task_id", false); - putWaitingOnMePropertyToServerName(WaitingOnMe.WAIT_TYPE, "wait_type", false); - putWaitingOnMePropertyToServerName(WaitingOnMe.CREATED_AT, "created_at", false); - putWaitingOnMePropertyToServerName(WaitingOnMe.DELETED_AT, "deleted_at", true); - putWaitingOnMePropertyToServerName(WaitingOnMe.READ_AT, "read_at", true); - putWaitingOnMePropertyToServerName(WaitingOnMe.ACKNOWLEDGED, "acknowledged", true); - - // Reverse the mapping to construct the server to local map - WAITING_ON_ME_PROPERTIES_SERVER_TO_LOCAL = AndroidUtilities.reverseMap(WAITING_ON_ME_PROPERTIES_LOCAL_TO_SERVER); - } - - // ---------- // Mapping helpers // ---------- private static B mapColumnName(String table, A col, Map taskMap, Map tagMap, Map userMap, - Map userActivityMap, Map taskAttachmentMap, Map taskListMetadataMap, Map waitingOnMeMap) { + Map userActivityMap, Map taskAttachmentMap, Map taskListMetadataMap) { Map map = null; if (TABLE_ID_TASKS.equals(table)) { map = taskMap; @@ -385,8 +345,6 @@ public class NameMaps { map = taskAttachmentMap; } else if (TABLE_ID_TASK_LIST_METADATA.equals(table)) { map = taskListMetadataMap; - } else if (TABLE_ID_WAITING_ON_ME.equals(table)) { - map = waitingOnMeMap; } if (map == null) { @@ -421,10 +379,6 @@ public class NameMaps { if (TASK_LIST_METADATA_COLUMN_NAMES_TO_PROPERTIES.containsKey(column)) { return !TASK_LIST_METADATA_PROPERTIES_EXCLUDED.contains(column); } - } else if (TABLE_ID_WAITING_ON_ME.equals(table)) { - if (WAITING_ON_ME_COLUMN_NAMES_TO_PROPERTIES.containsKey(column)) { - return !WAITING_ON_ME_PROPERTIES_EXCLUDED.contains(column); - } } return false; } @@ -432,29 +386,25 @@ public class NameMaps { public static String localPropertyToServerColumnName(String table, Property localProperty) { return mapColumnName(table, localProperty, TASK_PROPERTIES_LOCAL_TO_SERVER, TAG_DATA_PROPERTIES_LOCAL_TO_SERVER, USER_PROPERTIES_LOCAL_TO_SERVER, USER_ACTIVITY_PROPERTIES_LOCAL_TO_SERVER, - TASK_ATTACHMENT_PROPERTIES_LOCAL_TO_SERVER, TASK_LIST_METADATA_PROPERTIES_LOCAL_TO_SERVER, - WAITING_ON_ME_PROPERTIES_LOCAL_TO_SERVER); + TASK_ATTACHMENT_PROPERTIES_LOCAL_TO_SERVER, TASK_LIST_METADATA_PROPERTIES_LOCAL_TO_SERVER); } public static String localColumnNameToServerColumnName(String table, String localColumn) { return mapColumnName(table, localColumn, TASK_COLUMNS_LOCAL_TO_SERVER, TAG_DATA_COLUMNS_LOCAL_TO_SERVER, USER_COLUMNS_LOCAL_TO_SERVER, USER_ACTIVITY_COLUMNS_LOCAL_TO_SERVER, - TASK_ATTACHMENT_COLUMNS_LOCAL_TO_SERVER, TASK_LIST_METADATA_COLUMNS_LOCAL_TO_SERVER, - WAITING_ON_ME_COLUMNS_LOCAL_TO_SERVER); + TASK_ATTACHMENT_COLUMNS_LOCAL_TO_SERVER, TASK_LIST_METADATA_COLUMNS_LOCAL_TO_SERVER); } public static Property localColumnNameToProperty(String table, String localColumn) { return mapColumnName(table, localColumn, TASK_COLUMN_NAMES_TO_PROPERTIES, TAG_DATA_COLUMN_NAMES_TO_PROPERTIES, USER_COLUMN_NAMES_TO_PROPERTIES, USER_ACTIVITY_COLUMN_NAMES_TO_PROPERTIES, - TASK_ATTACHMENT_COLUMN_NAMES_TO_PROPERTIES, TASK_LIST_METADATA_COLUMN_NAMES_TO_PROPERTIES, - WAITING_ON_ME_COLUMN_NAMES_TO_PROPERTIES); + TASK_ATTACHMENT_COLUMN_NAMES_TO_PROPERTIES, TASK_LIST_METADATA_COLUMN_NAMES_TO_PROPERTIES); } public static Property serverColumnNameToLocalProperty(String table, String serverColumn) { return mapColumnName(table, serverColumn, TASK_PROPERTIES_SERVER_TO_LOCAL, TAG_DATA_PROPERTIES_SERVER_TO_LOCAL, USER_PROPERTIES_SERVER_TO_LOCAL, USER_ACTIVITY_PROPERTIES_SERVER_TO_LOCAL, - TASK_ATTACHMENT_PROPERTIES_SERVER_TO_LOCAL, TASK_LIST_METADATA_PROPERTIES_SERVER_TO_LOCAL, - WAITING_ON_ME_PROPERTIES_SERVER_TO_LOCAL); + TASK_ATTACHMENT_PROPERTIES_SERVER_TO_LOCAL, TASK_LIST_METADATA_PROPERTIES_SERVER_TO_LOCAL); } } diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java b/astrid/src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java index faca69a1b..fc76c83d2 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java @@ -92,8 +92,6 @@ public class NowBriefed extends ServerToClientMessage pushedAtKey = NameMaps.PUSHED_AT_USERS; } else if (NameMaps.TABLE_ID_TASK_LIST_METADATA.equals(table)) { pushedAtKey = NameMaps.PUSHED_AT_TASK_LIST_METADATA; - } else if (NameMaps.TABLE_ID_WAITING_ON_ME.equals(table)) { - pushedAtKey = NameMaps.PUSHED_AT_WAITING_ON_ME; } if (pushedAtKey != null) { diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java b/astrid/src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java index cbcf47ad6..181db0ef5 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java @@ -9,7 +9,6 @@ import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.User; import com.todoroo.astrid.data.UserActivity; -import com.todoroo.astrid.data.WaitingOnMe; public abstract class ServerToClientMessage { @@ -64,8 +63,6 @@ public abstract class ServerToClientMessage { return new MakeChanges(json, PluginServices.getTaskAttachmentDao()); } else if (NameMaps.TABLE_ID_TASK_LIST_METADATA.equals(table)) { return new MakeChanges(json, PluginServices.getTaskListMetadataDao()); - } else if (NameMaps.TABLE_ID_WAITING_ON_ME.equals(table)) { - return new MakeChanges(json, PluginServices.getWaitingOnMeDao()); } else { return null; } @@ -85,8 +82,6 @@ public abstract class ServerToClientMessage { return new NowBriefed(json, PluginServices.getTaskAttachmentDao()); } else if (NameMaps.TABLE_ID_TASK_LIST_METADATA.equals(table)) { return new NowBriefed(json, PluginServices.getTaskListMetadataDao()); - } else if (NameMaps.TABLE_ID_WAITING_ON_ME.equals(table)) { - return new NowBriefed(json, PluginServices.getWaitingOnMeDao()); } else { return null; } diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 80db3824a..6447319f6 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -73,13 +73,11 @@ import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.dao.TaskAttachmentDao; import com.todoroo.astrid.dao.TaskOutstandingDao; import com.todoroo.astrid.dao.UserDao; -import com.todoroo.astrid.dao.WaitingOnMeDao; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskOutstanding; import com.todoroo.astrid.data.User; -import com.todoroo.astrid.data.WaitingOnMe; import com.todoroo.astrid.files.AACRecordingActivity; import com.todoroo.astrid.files.FileExplore; import com.todoroo.astrid.files.FileUtilities; @@ -215,9 +213,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { @Autowired private ActFmPreferenceService actFmPreferenceService; - @Autowired - private WaitingOnMeDao waitingOnMeDao; - @Autowired private UserDao userDao; @@ -728,7 +723,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { if (model != null) { // came from bundle setIsNewTask(model.getValue(Task.TITLE).length() == 0); - setupWaitingOnMe(); return; } @@ -763,7 +757,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } setIsNewTask(model.getValue(Task.TITLE).length() == 0); - setupWaitingOnMe(); if (model == null) { exceptionService.reportError("task-edit-no-task", @@ -777,86 +770,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } - private void setupWaitingOnMe() { - if (!isNewTask) { - WaitingOnMe wom = waitingOnMeDao.findByTask(model.getUuid()); - if (wom != null) { - final View waitingOnMe = getView().findViewById(R.id.waiting_on_me); - waitingOnMe.setVisibility(View.VISIBLE); - - int themeColor = getResources().getColor(ThemeService.getTaskEditThemeColor()); - - TextView dismiss = (TextView) waitingOnMe.findViewById(R.id.wom_dismiss); - dismiss.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - WaitingOnMe template = new WaitingOnMe(); - template.setValue(WaitingOnMe.DELETED_AT, DateUtilities.now()); - waitingOnMeDao.update(WaitingOnMe.TASK_UUID.eq(model.getUuid()), template); - waitingOnMe.setVisibility(View.GONE); - } - }); - dismiss.setTextColor(getResources().getColor(R.color.task_edit_deadline_gray)); - GradientDrawable gd = new GradientDrawable(); - gd.setColor(ThemeService.getDarkVsLight(Color.rgb(0xee, 0xee, 0xee), Color.rgb(0x22, 0x22, 0x22), false)); - gd.setCornerRadius(4.0f); - dismiss.setBackgroundDrawable(gd); - - TextView ack = (TextView) waitingOnMe.findViewById(R.id.wom_acknowledge); - ack.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - WaitingOnMe template = new WaitingOnMe(); - template.setValue(WaitingOnMe.ACKNOWLEDGED, 1); - waitingOnMeDao.update(WaitingOnMe.TASK_UUID.eq(model.getUuid()), template); - waitingOnMe.setVisibility(View.GONE); - } - }); - ack.setTextColor(themeColor); - gd = new GradientDrawable(); - gd.setColor(ThemeService.getDarkVsLight(Color.WHITE, Color.rgb(0x22, 0x22, 0x22), false)); - gd.setCornerRadius(4.0f); - ack.setBackgroundDrawable(gd); - - TextView womText = (TextView) waitingOnMe.findViewById(R.id.wom_message); - womText.setText(getWomText(wom)); - womText.setTextColor(themeColor); - - ImageView womIcon = (ImageView) waitingOnMe.findViewById(R.id.wom_icon); - womIcon.setImageResource(ThemeService.getTaskEditDrawable(R.drawable.tea_icn_waiting, R.drawable.tea_icn_waiting_lightblue)); - } - } - } - - private String getWomText(WaitingOnMe wom) { - int resource; - String type = wom.getValue(WaitingOnMe.WAIT_TYPE); - if (WaitingOnMe.WAIT_TYPE_ASSIGNED.equals(type)) { - resource = R.string.wom_assigned; - } else if (WaitingOnMe.WAIT_TYPE_CHANGED_DUE.equals(type)) { - resource = R.string.wom_changed_due; - } else if (WaitingOnMe.WAIT_TYPE_COMMENTED.equals(type)) { - resource = R.string.wom_commented; - } else if (WaitingOnMe.WAIT_TYPE_MENTIONED.equals(type)) { - resource = R.string.wom_mentioned; - } else if (WaitingOnMe.WAIT_TYPE_RAISED_PRI.equals(type)) { - resource = R.string.wom_raised_pri; - } else { - resource = R.string.wom_default; - } - - String userString = null; - User user = userDao.fetch(wom.getValue(WaitingOnMe.WAITING_USER_ID), User.PROPERTIES); - if (user != null) { - userString = user.getDisplayName(); - } - if (TextUtils.isEmpty(userString)) { - userString = getString(R.string.ENA_no_user); - } - - return getString(resource, userString); - } - public long getTaskIdInProgress() { if (model != null && model.getId() > 0) { return model.getId(); diff --git a/astrid/src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/src/com/todoroo/astrid/core/CoreFilterExposer.java index c02dd9bdd..aa5ca198a 100644 --- a/astrid/src/com/todoroo/astrid/core/CoreFilterExposer.java +++ b/astrid/src/com/todoroo/astrid/core/CoreFilterExposer.java @@ -24,7 +24,6 @@ import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; -import com.todoroo.astrid.actfm.WaitingOnMeFragment; import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridFilterExposer; @@ -36,7 +35,6 @@ import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.data.WaitingOnMe; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TaskToTagMetadata; @@ -107,20 +105,6 @@ public final class CoreFilterExposer extends BroadcastReceiver implements Astrid return todayFilter; } - public static Filter getWaitingOnMeFilter(Resources r) { - FilterWithCustomIntent waitingOnMe = new FilterWithCustomIntent(r.getString(R.string.BFE_waiting_on_me), r.getString(R.string.BFE_waiting_on_me), - new QueryTemplate().join(Join.inner(WaitingOnMe.TABLE, Task.UUID.eq(WaitingOnMe.TASK_UUID))).where( - Criterion.and(WaitingOnMe.DELETED_AT.eq(0), - Criterion.or(WaitingOnMe.ACKNOWLEDGED.isNull(), WaitingOnMe.ACKNOWLEDGED.neq(1)))) - .groupBy(Task.UUID), null); - waitingOnMe.customTaskList = new ComponentName(ContextManager.getContext(), WaitingOnMeFragment.class); - int themeFlags = ThemeService.getFilterThemeFlags(); - waitingOnMe.listingIcon = ((BitmapDrawable) r.getDrawable( - ThemeService.getDrawable(R.drawable.waiting_on_me, themeFlags))).getBitmap(); - return waitingOnMe; - - } - /** * Is this the inbox? * @param filter diff --git a/astrid/src/com/todoroo/astrid/core/PluginServices.java b/astrid/src/com/todoroo/astrid/core/PluginServices.java index 5412a2695..00f8015f7 100644 --- a/astrid/src/com/todoroo/astrid/core/PluginServices.java +++ b/astrid/src/com/todoroo/astrid/core/PluginServices.java @@ -27,8 +27,6 @@ import com.todoroo.astrid.dao.TaskOutstandingDao; import com.todoroo.astrid.dao.UserActivityDao; import com.todoroo.astrid.dao.UserActivityOutstandingDao; import com.todoroo.astrid.dao.UserDao; -import com.todoroo.astrid.dao.WaitingOnMeDao; -import com.todoroo.astrid.dao.WaitingOnMeOutstandingDao; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.service.AddOnService; @@ -105,12 +103,6 @@ public final class PluginServices { @Autowired TaskListMetadataOutstandingDao taskListMetadataOutstandingDao; - @Autowired - WaitingOnMeDao waitingOnMeDao; - - @Autowired - WaitingOnMeOutstandingDao waitingOnMeOutstandingDao; - @Autowired ActFmPreferenceService actFmPreferenceService; @@ -221,14 +213,6 @@ public final class PluginServices { return getInstance().taskListMetadataOutstandingDao; } - public static WaitingOnMeDao getWaitingOnMeDao() { - return getInstance().waitingOnMeDao; - } - - public static WaitingOnMeOutstandingDao getWaitingOnMeOutstandingDao() { - return getInstance().waitingOnMeOutstandingDao; - } - public static ActFmPreferenceService getActFmPreferenceService() { return getInstance().actFmPreferenceService; } diff --git a/astrid/src/com/todoroo/astrid/dao/Database.java b/astrid/src/com/todoroo/astrid/dao/Database.java index 4f901c46e..76fb5db71 100644 --- a/astrid/src/com/todoroo/astrid/dao/Database.java +++ b/astrid/src/com/todoroo/astrid/dao/Database.java @@ -31,8 +31,6 @@ import com.todoroo.astrid.data.Update; import com.todoroo.astrid.data.User; import com.todoroo.astrid.data.UserActivity; import com.todoroo.astrid.data.UserActivityOutstanding; -import com.todoroo.astrid.data.WaitingOnMe; -import com.todoroo.astrid.data.WaitingOnMeOutstanding; import com.todoroo.astrid.provider.Astrid2TaskProvider; import com.todoroo.astrid.provider.Astrid3ContentProvider; import com.todoroo.astrid.widget.TasksWidget; @@ -75,14 +73,11 @@ public class Database extends AbstractDatabase { History.TABLE, TaskAttachment.TABLE, TaskListMetadata.TABLE, - WaitingOnMe.TABLE, - TaskOutstanding.TABLE, TagOutstanding.TABLE, UserActivityOutstanding.TABLE, TaskAttachmentOutstanding.TABLE, - TaskListMetadataOutstanding.TABLE, - WaitingOnMeOutstanding.TABLE + TaskListMetadataOutstanding.TABLE }; // --- listeners @@ -385,9 +380,6 @@ public class Database extends AbstractDatabase { tryExecSQL(addColumnSql(User.TABLE, User.LAST_NAME, visitor, null)); case 30: - tryExecSQL(createTableSql(visitor, WaitingOnMe.TABLE.name, WaitingOnMe.PROPERTIES)); - tryExecSQL(createTableSql(visitor, WaitingOnMeOutstanding.TABLE.name, WaitingOnMeOutstanding.PROPERTIES)); - case 31: tryExecSQL(addColumnSql(Task.TABLE, Task.HISTORY_HAS_MORE, visitor, null)); tryExecSQL(addColumnSql(TagData.TABLE, TagData.HISTORY_HAS_MORE, visitor, null)); diff --git a/astrid/src/com/todoroo/astrid/dao/WaitingOnMeDao.java b/astrid/src/com/todoroo/astrid/dao/WaitingOnMeDao.java deleted file mode 100644 index e5fae5d35..000000000 --- a/astrid/src/com/todoroo/astrid/dao/WaitingOnMeDao.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.todoroo.astrid.dao; - -import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.andlib.service.Autowired; -import com.todoroo.andlib.service.DependencyInjectionService; -import com.todoroo.andlib.sql.Criterion; -import com.todoroo.andlib.sql.Query; -import com.todoroo.astrid.actfm.sync.messages.NameMaps; -import com.todoroo.astrid.data.WaitingOnMe; - -public class WaitingOnMeDao extends RemoteModelDao { - - @Autowired - private Database database; - - public WaitingOnMeDao() { - super(WaitingOnMe.class); - DependencyInjectionService.getInstance().inject(this); - setDatabase(database); - } - - @Override - protected boolean shouldRecordOutstandingEntry(String columnName, Object value) { - return NameMaps.shouldRecordOutstandingColumnForTable(NameMaps.TABLE_ID_WAITING_ON_ME, columnName); - } - - public WaitingOnMe findByTask(String taskUuid) { - TodorooCursor cursor = query(Query.select(WaitingOnMe.PROPERTIES).where( - Criterion.and(WaitingOnMe.TASK_UUID.eq(taskUuid), - Criterion.or(WaitingOnMe.ACKNOWLEDGED.eq(0), WaitingOnMe.ACKNOWLEDGED.isNull()), - Criterion.or(WaitingOnMe.DELETED_AT.eq(0), WaitingOnMe.DELETED_AT.isNull())))); - cursor.moveToFirst(); - return returnFetchResult(cursor); - } -} diff --git a/astrid/src/com/todoroo/astrid/dao/WaitingOnMeOutstandingDao.java b/astrid/src/com/todoroo/astrid/dao/WaitingOnMeOutstandingDao.java deleted file mode 100644 index 0edb6783d..000000000 --- a/astrid/src/com/todoroo/astrid/dao/WaitingOnMeOutstandingDao.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.todoroo.astrid.dao; - -import com.todoroo.astrid.data.WaitingOnMeOutstanding; - -public class WaitingOnMeOutstandingDao extends OutstandingEntryDao { - - public WaitingOnMeOutstandingDao() { - super(WaitingOnMeOutstanding.class); - } - -} diff --git a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java index 6bdf45ccd..dca06a494 100644 --- a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java +++ b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java @@ -31,8 +31,6 @@ import com.todoroo.astrid.dao.UpdateDao; import com.todoroo.astrid.dao.UserActivityDao; import com.todoroo.astrid.dao.UserActivityOutstandingDao; import com.todoroo.astrid.dao.UserDao; -import com.todoroo.astrid.dao.WaitingOnMeDao; -import com.todoroo.astrid.dao.WaitingOnMeOutstandingDao; import com.todoroo.astrid.gtasks.GtasksListService; import com.todoroo.astrid.gtasks.GtasksMetadataService; import com.todoroo.astrid.gtasks.GtasksPreferenceService; @@ -92,8 +90,6 @@ public class AstridDependencyInjector extends AbstractDependencyInjector { injectables.put("taskAttachmentOutstandingDao", TaskAttachmentOutstandingDao.class); injectables.put("taskListMetadataDao", TaskListMetadataDao.class); injectables.put("taskListMetadataOutstandingDao", TaskListMetadataOutstandingDao.class); - injectables.put("waitingOnMeDao", WaitingOnMeDao.class); - injectables.put("waitingOnMeOutstandingDao", WaitingOnMeOutstandingDao.class); // com.todoroo.astrid.service injectables.put("taskService", TaskService.class); diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java index 58de0cc5e..505072fdd 100644 --- a/astrid/src/com/todoroo/astrid/service/StartupService.java +++ b/astrid/src/com/todoroo/astrid/service/StartupService.java @@ -53,7 +53,6 @@ import com.todoroo.astrid.dao.TaskAttachmentDao; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskListMetadataDao; import com.todoroo.astrid.dao.UserActivityDao; -import com.todoroo.astrid.dao.WaitingOnMeDao; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Task; @@ -109,8 +108,6 @@ public class StartupService { @Autowired TaskListMetadataDao taskListMetadataDao; - @Autowired WaitingOnMeDao waitingOnMeDao; - @Autowired MetadataService metadataService; @Autowired Database database; @@ -222,7 +219,7 @@ public class StartupService { abTestInvoker.reportAcquisition(); initializeDatabaseListeners(); - ActFmSyncThread.initializeSyncComponents(taskDao, tagDataDao, userActivityDao, taskAttachmentDao, taskListMetadataDao, waitingOnMeDao); + ActFmSyncThread.initializeSyncComponents(taskDao, tagDataDao, userActivityDao, taskAttachmentDao, taskListMetadataDao); // perform startup activities in a background thread new Thread(new Runnable() { diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index b5f2b0438..80c767938 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -249,8 +249,6 @@ public class ThemeService { return R.drawable.filter_calendar_dark; case R.drawable.filter_inbox: return R.drawable.filter_inbox_dark; - case R.drawable.waiting_on_me: - return R.drawable.waiting_on_me_dark; case R.drawable.filter_pencil: return R.drawable.filter_pencil_dark; case R.drawable.filter_sliders: