diff --git a/README.md b/README.md index fa9e81df7..ccbb78261 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,11 @@ Getting Started With Development --------------- Requires [Android Studio](http://developer.android.com/sdk/installing/studio.html) + +To Do +----- +* Gradle +* Widgets +* Remove dead code +* Remove unused resources and preferences +* Fix warnings 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 042221b0a..000000000 --- a/api/src/com/todoroo/astrid/data/WaitingOnMe.java +++ /dev/null @@ -1,123 +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() { - } - - public WaitingOnMe(TodorooCursor cursor) { - this(); - readPropertiesFromCursor(cursor); - } - - public void readFromCursor(TodorooCursor cursor) { - 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 25f6be986..000000000 --- a/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java +++ /dev/null @@ -1,69 +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/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java index 2b98e1dc1..44a9eb19e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java @@ -55,7 +55,6 @@ import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.TagDataDao; import com.todoroo.astrid.dao.TagMetadataDao; -import com.todoroo.astrid.dao.TagMetadataDao.TagMetadataCriteria; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.dao.TaskListMetadataDao; import com.todoroo.astrid.dao.UserDao; @@ -65,7 +64,6 @@ import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.TagMetadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskListMetadata; -import com.todoroo.astrid.data.User; import com.todoroo.astrid.data.UserActivity; import com.todoroo.astrid.helper.AsyncImageView; import com.todoroo.astrid.service.SyncV2Service; @@ -73,7 +71,6 @@ import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.subtasks.SubtasksTagListFragment; import com.todoroo.astrid.tags.TagFilterExposer; -import com.todoroo.astrid.tags.TagMemberMetadata; import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagService.Tag; import com.todoroo.astrid.tags.TaskToTagMetadata; @@ -224,11 +221,9 @@ public class TagViewFragment extends TaskListFragment { @Override protected void addMenuItems(Menu menu, Activity activity) { super.addMenuItems(menu, activity); - if (!Preferences.getBoolean(R.string.p_show_list_members, true)) { - MenuItem item = menu.add(Menu.NONE, MENU_LIST_SETTINGS_ID, 0, R.string.tag_settings_title); - item.setIcon(ThemeService.getDrawable(R.drawable.list_settings)); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); - } + MenuItem item = menu.add(Menu.NONE, MENU_LIST_SETTINGS_ID, 0, R.string.tag_settings_title); + item.setIcon(ThemeService.getDrawable(R.drawable.list_settings)); + item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); } // --- data loading @@ -468,235 +463,7 @@ public class TagViewFragment extends TaskListFragment { } protected void setUpMembersGallery() { - if (!Preferences.getBoolean(R.string.p_show_list_members, true)) { - getView().findViewById(R.id.members_header).setVisibility(View.GONE); - return; - } - if (tagData == null) { - return; - } - LinearLayout membersView = (LinearLayout) getView().findViewById(R.id.shared_with); - membersView.setOnClickListener(settingsListener); - boolean addedMembers = false; - try { - String membersString = tagData.getValue(TagData.MEMBERS); // OK for legacy compatibility - if (!TextUtils.isEmpty(membersString)) { - JSONArray members = new JSONArray(membersString); - if (members.length() > 0) { - addedMembers = true; - membersView.setOnClickListener(null); - membersView.removeAllViews(); - for (int i = 0; i < members.length(); i++) { - JSONObject member = members.getJSONObject(i); - addImageForMember(membersView, member); - } - } - } else { - TodorooCursor users = userDao.query(Query.select(User.PROPERTIES) - .where(User.UUID.in(Query.select(TagMemberMetadata.USER_UUID) - .from(TagMetadata.TABLE) - .where(Criterion.and(TagMetadataCriteria.byTagAndWithKey(tagData.getUuid(), TagMemberMetadata.KEY), TagMetadata.DELETION_DATE.eq(0)))))); - try { - addedMembers = users.getCount() > 0; - if (addedMembers) { - membersView.setOnClickListener(null); - membersView.removeAllViews(); - } - User user = new User(); - for (users.moveToFirst(); !users.isAfterLast(); users.moveToNext()) { - user.clear(); - user.readFromCursor(users); - JSONObject member = new JSONObject(); - ActFmSyncService.JsonHelper.jsonFromUser(member, user); - addImageForMember(membersView, member); - } - } finally { - users.close(); - } - - TodorooCursor byEmail = tagMetadataDao.query(Query.select(TagMemberMetadata.USER_UUID) - .where(Criterion.and(TagMetadataCriteria.byTagAndWithKey(tagData.getUuid(), TagMemberMetadata.KEY), - TagMemberMetadata.USER_UUID.like("%@%"), TagMetadata.DELETION_DATE.eq(0)))); //$NON-NLS-1$ - try { - if (!addedMembers && byEmail.getCount() > 0) { - membersView.setOnClickListener(null); - membersView.removeAllViews(); - } - addedMembers = addedMembers || byEmail.getCount() > 0; - TagMetadata tm = new TagMetadata(); - for (byEmail.moveToFirst(); !byEmail.isAfterLast(); byEmail.moveToNext()) { - tm.clear(); - tm.readFromCursor(byEmail); - String email = tm.getValue(TagMemberMetadata.USER_UUID); - if (!TextUtils.isEmpty(email)) { - JSONObject member = new JSONObject(); - member.put("email", email); //$NON-NLS-1$ - addImageForMember(membersView, member); - } - } - } finally { - byEmail.close(); - } - } - } catch (JSONException e) { - e.printStackTrace(); - } - - if (addedMembers) { - try { - // Handle creator - JSONObject owner; - if (!Task.USER_ID_SELF.equals(tagData.getValue(TagData.USER_ID))) { - String userString = tagData.getValue(TagData.USER); - if (!TextUtils.isEmpty(userString)) { - owner = new JSONObject(tagData.getValue(TagData.USER)); - } else { - User user = userDao.fetch(tagData.getValue(TagData.USER_ID), User.PROPERTIES); - if (user != null) { - owner = new JSONObject(); - ActFmSyncService.JsonHelper.jsonFromUser(owner, user); - } else { - owner = null; - } - } - } else { - owner = ActFmPreferenceService.thisUser(); - } - if (owner != null) { - addImageForMember(membersView, owner); - } - - JSONObject unassigned = new JSONObject(); - unassigned.put("id", Task.USER_ID_UNASSIGNED); //$NON-NLS-1$ - unassigned.put("name", getActivity().getString(R.string.actfm_EPA_unassigned)); //$NON-NLS-1$ - addImageForMember(membersView, unassigned); - } catch (JSONException e) { - e.printStackTrace(); - } - } else { - membersView.removeAllViews(); - membersView.setOnClickListener(settingsListener); - TextView textView = (TextView) getActivity().getLayoutInflater().inflate(R.layout.no_members_text_view, null); - membersView.addView(textView); - } - - View filterAssigned = getView().findViewById(R.id.filter_assigned); - if (filterAssigned != null) { - filterAssigned.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - resetAssignedFilter(); - } - }); - } - } - - - private void addImageForMember(LinearLayout membersView, JSONObject member) { - DisplayMetrics displayMetrics = new DisplayMetrics(); - getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); - AsyncImageView image = new AsyncImageView(getActivity()); - image.setLayoutParams(new LinearLayout.LayoutParams((int) (43 * displayMetrics.density), - (int) (43 * displayMetrics.density))); - - - image.setDefaultImageDrawable(ResourceDrawableCache.getImageDrawableFromId(resources, R.drawable.icn_default_person_image)); - if (Task.USER_ID_UNASSIGNED.equals(Long.toString(member.optLong("id", 0)))) { - image.setDefaultImageDrawable(ResourceDrawableCache.getImageDrawableFromId(resources, R.drawable.icn_anyone)); - } - - image.setScaleType(ImageView.ScaleType.FIT_CENTER); - try { - final String id = Long.toString(member.optLong("id", -2)); - if (ActFmPreferenceService.userId().equals(id)) { - member = ActFmPreferenceService.thisUser(); - } - final JSONObject memberToUse = member; - - final String memberName = displayName(memberToUse); - if (memberToUse.has("picture") && !TextUtils.isEmpty(memberToUse.getString("picture"))) { - image.setUrl(memberToUse.getString("picture")); - } - image.setOnClickListener(listenerForImage(memberToUse, id, memberName)); - } catch (JSONException e) { - e.printStackTrace(); - } - int padding = (int) (3 * displayMetrics.density); - image.setPadding(padding, padding, padding, padding); - membersView.addView(image); - } - - private OnClickListener listenerForImage(final JSONObject member, final String id, final String displayName) { - return new OnClickListener() { - final String email = member.optString("email"); //$NON-NLS-1$ - - - @Override - public void onClick(View v) { - if (currentId.equals(id)) { - // Back to all - resetAssignedFilter(); - } else { - // New filter - currentId = id; - Criterion assignedCriterion; - if (ActFmPreferenceService.userId().equals(currentId)) { - assignedCriterion = Criterion.or(Task.USER_ID.eq(0), Task.USER_ID.eq(id)); - } else if (Task.userIdIsEmail(currentId) && !TextUtils.isEmpty(email)) { - assignedCriterion = Criterion.or(Task.USER_ID.eq(email), Task.USER.like("%" + email + "%")); //$NON-NLS-1$ //$NON-NLS-2$ // Deprecated field OK for backwards compatibility - } else { - assignedCriterion = Task.USER_ID.eq(id); - } - Criterion assigned = Criterion.and(TaskCriteria.activeAndVisible(), assignedCriterion); - filter = TagFilterExposer.filterFromTag(getActivity(), new Tag(tagData), assigned); - TextView filterByAssigned = (TextView) getView().findViewById(R.id.filter_assigned); - if (filterByAssigned != null) { - filterByAssigned.setVisibility(View.VISIBLE); - if (id == Task.USER_ID_UNASSIGNED) { - filterByAssigned.setText(getString(R.string.actfm_TVA_filter_by_unassigned)); - } else { - filterByAssigned.setText(getString(R.string.actfm_TVA_filtered_by_assign, displayName)); - } - } - isBeingFiltered.set(true); - setUpTaskList(); - } - } - }; - } - - private void resetAssignedFilter() { - currentId = Task.USER_ID_IGNORE; - isBeingFiltered.set(false); - filter = originalFilter; - View filterAssigned = getView().findViewById(R.id.filter_assigned); - if (filterAssigned != null) { - filterAssigned.setVisibility(View.GONE); - } - setUpTaskList(); - } - - - private String displayName(JSONObject user) { - String name = user.optString("name"); - if (!TextUtils.isEmpty(name) && !"null".equals(name)) { - name = name.trim(); - int index = name.indexOf(' '); - if (index > 0) { - return name.substring(0, index); - } else { - return name; - } - } else { - String email = user.optString("email"); - email = email.trim(); - int index = email.indexOf('@'); - if (index > 0) { - return email.substring(0, index); - } else { - return email; - } - } + getView().findViewById(R.id.members_header).setVisibility(View.GONE); } // --- receivers diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/WaitingOnMeFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/WaitingOnMeFragment.java deleted file mode 100644 index e82257030..000000000 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/WaitingOnMeFragment.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.todoroo.astrid.actfm; - -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; - -import java.util.concurrent.atomic.AtomicReference; - -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/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java index 867424140..542d3771e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java @@ -44,8 +44,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; @@ -57,7 +55,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; @@ -141,8 +132,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; @@ -152,7 +142,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()); } } } @@ -160,7 +150,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) { @@ -175,7 +165,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(); } @@ -207,7 +196,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); } @@ -280,7 +269,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); } @@ -457,7 +445,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/plugin-src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java index 51e194838..7631136ec 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java +++ b/astrid/plugin-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/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java index c041ff8dc..08aff013a 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java @@ -26,8 +26,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; import org.apache.http.entity.mime.MultipartEntity; import org.apache.http.entity.mime.content.FileBody; @@ -68,9 +66,6 @@ public class ChangesHappened(id, WaitingOnMe.class, - PluginServices.getWaitingOnMeDao(), PluginServices.getWaitingOnMeOutstandingDao()); default: return null; } diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConvertSelfUserIdsToZero.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConvertSelfUserIdsToZero.java index 5921b024d..c01f1138e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConvertSelfUserIdsToZero.java +++ b/astrid/plugin-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/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java index c60016e4f..4e4a2cdfd 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 @@ -10,7 +10,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; import java.util.HashMap; import java.util.HashSet; @@ -34,7 +33,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; @@ -42,7 +40,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 @@ -54,7 +51,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); @@ -94,8 +90,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; } @@ -333,46 +327,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; @@ -386,8 +346,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) { @@ -422,10 +380,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; } @@ -433,29 +387,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/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java index cbfe2c75b..edc876049 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java @@ -93,8 +93,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/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java index 444ab5340..227567b26 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java @@ -7,7 +7,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; import org.json.JSONObject; @@ -65,8 +64,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; } @@ -86,8 +83,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/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java index 28fd3891b..b2ea70f57 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java @@ -21,7 +21,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; @@ -33,7 +32,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; @@ -67,12 +65,6 @@ public final class CoreFilterExposer extends BroadcastReceiver implements Astrid filters.add(getTodayFilter(r)); } - if (Preferences.getBoolean(R.string.p_show_waiting_on_me_filter, true) && - PluginServices.getWaitingOnMeDao().count(Query.select(WaitingOnMe.ID).where(Criterion.and(WaitingOnMe.DELETED_AT.eq(0), - Criterion.or(WaitingOnMe.ACKNOWLEDGED.isNull(), WaitingOnMe.ACKNOWLEDGED.neq(1))))) > 0) { - filters.add(getWaitingOnMeFilter(r)); - } - // transmit filter list return filters.toArray(new FilterListItem[filters.size()]); } @@ -113,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? * diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java index a499293a3..d5a75d5fd 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java @@ -101,10 +101,6 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr list.add(recent); } - if (Preferences.getBoolean(R.string.p_show_ive_assigned_filter, true)) { - list.add(getAssignedByMeFilter(r)); - } - if (useCustomFilters && cursor != null) { StoreObject savedFilter = new StoreObject(); for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { @@ -130,19 +126,6 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr } } - public static Filter getAssignedByMeFilter(Resources r) { - int themeFlags = ThemeService.getFilterThemeFlags(); - Filter f = new Filter(r.getString(R.string.BFE_Assigned), - r.getString(R.string.BFE_Assigned), - new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(), - Criterion.or(Task.CREATOR_ID.eq(0), Task.CREATOR_ID.eq(ActFmPreferenceService.userId())), - Task.USER_ID.neq(0))), - null); - f.listingIcon = ((BitmapDrawable) r.getDrawable( - ThemeService.getDrawable(R.drawable.filter_assigned, themeFlags))).getBitmap(); - return f; - } - /** * Simple activity for deleting stuff * diff --git a/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java b/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java index 034241b35..f86aeef5b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java +++ b/astrid/plugin-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.AstridDependencyInjector; @@ -100,12 +98,6 @@ public final class PluginServices { @Autowired TaskListMetadataOutstandingDao taskListMetadataOutstandingDao; - @Autowired - WaitingOnMeDao waitingOnMeDao; - - @Autowired - WaitingOnMeOutstandingDao waitingOnMeOutstandingDao; - @Autowired ActFmPreferenceService actFmPreferenceService; @@ -212,14 +204,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/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java index 34d0a532f..eec950d00 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java @@ -160,74 +160,6 @@ public class ReminderDialog extends Dialog { private void setupSpeechBubble(Activity activity, long taskId) { ((TextView) findViewById(R.id.reminder_message)).setText( Notifications.getRandomReminder(activity.getResources().getStringArray(R.array.reminder_responses))); - - if (Preferences.getBoolean(R.string.p_rmd_social, true)) { - Task task = new Task(); - task.setId(taskId); - addFacesToReminder(activity, task); - } - } - - private void addFacesToReminder(Activity activity, Task task) { - if (task == null) { - return; - } - Resources resources = activity.getResources(); - LinkedHashSet pictureUrls = new LinkedHashSet(); - List names = new ArrayList(); - AtomicBoolean isSharedTask = new AtomicBoolean(false); - - if (pictureUrls.size() < MAX_FACES) { - addTagFaces(task.getId(), pictureUrls, names, isSharedTask); - } - - if (pictureUrls.size() > 0) { - DisplayMetrics metrics = activity.getResources().getDisplayMetrics(); - LinearLayout layout = new LinearLayout(activity); - LinearLayout.LayoutParams containerParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); - containerParams.setMargins((int) (-7 * metrics.density), 0, 0, 0); - layout.setLayoutParams(containerParams); - - int padding = (int) (8 * metrics.density); - - int count = 0; - for (String url : pictureUrls) { - AsyncImageView image = new AsyncImageView(activity); - image.setDefaultImageDrawable(ResourceDrawableCache.getImageDrawableFromId(resources, R.drawable.icn_default_person_image)); - image.setUrl(url); - - LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams((int) (35 * metrics.density), (int) (35 * metrics.density)); - lp.setMargins(padding, padding, 0, padding); - image.setLayoutParams(lp); - layout.addView(image); - if (++count >= MAX_FACES) { - break; - } - } - - LinearLayout container = (LinearLayout) findViewById(R.id.speech_bubble_content); - container.setOrientation(LinearLayout.VERTICAL); - container.addView(layout, 0); - - String text; - if (names.size() == 0) { - text = activity.getString(R.string.reminders_social); - } else if (names.size() == 1) { - text = activity.getString(R.string.reminders_social_one, names.get(0)); - } else { - text = activity.getString(R.string.reminders_social_multiple, names.get(0), names.get(1)); - } - - ((TextView) findViewById(R.id.reminder_message)).setText(text); - - task.setValue(Task.SOCIAL_REMINDER, Task.REMINDER_SOCIAL_FACES); - } else { - if (isSharedTask.get()) { - task.setValue(Task.SOCIAL_REMINDER, Task.REMINDER_SOCIAL_NO_FACES); - } else { - task.setValue(Task.SOCIAL_REMINDER, Task.REMINDER_SOCIAL_PRIVATE); - } - } } private void addPicturesFromJSONArray(JSONArray array, LinkedHashSet pictureUrls, List names, AtomicBoolean isSharedTask) throws JSONException { diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java index 340c4a80c..f1e03e36d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java @@ -105,12 +105,6 @@ public class ReminderPreferences extends TodorooPreferenceActivity { } else { preference.setSummary(R.string.rmd_EPr_enabled_desc_false); } - } else if (r.getString(R.string.p_rmd_social).equals(preference.getKey())) { - if ((Boolean) value) { - preference.setSummary(R.string.rmd_EPr_social_summary_enabled); - } else { - preference.setSummary(R.string.rmd_EPr_social_summary_disabled); - } } } 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/drawable/welcome_walkthrough_1.png b/astrid/res/drawable/welcome_walkthrough_1.png deleted file mode 100644 index 6557477a9..000000000 Binary files a/astrid/res/drawable/welcome_walkthrough_1.png and /dev/null differ diff --git a/astrid/res/drawable/welcome_walkthrough_2.png b/astrid/res/drawable/welcome_walkthrough_2.png deleted file mode 100644 index 673d3e661..000000000 Binary files a/astrid/res/drawable/welcome_walkthrough_2.png and /dev/null differ diff --git a/astrid/res/drawable/welcome_walkthrough_3.png b/astrid/res/drawable/welcome_walkthrough_3.png deleted file mode 100644 index 7b1c20667..000000000 Binary files a/astrid/res/drawable/welcome_walkthrough_3.png and /dev/null differ diff --git a/astrid/res/drawable/welcome_walkthrough_4.png b/astrid/res/drawable/welcome_walkthrough_4.png deleted file mode 100644 index fad9e4b60..000000000 Binary files a/astrid/res/drawable/welcome_walkthrough_4.png and /dev/null differ diff --git a/astrid/res/drawable/welcome_walkthrough_5.png b/astrid/res/drawable/welcome_walkthrough_5.png deleted file mode 100644 index bbc0b736a..000000000 Binary files a/astrid/res/drawable/welcome_walkthrough_5.png and /dev/null differ diff --git a/astrid/res/drawable/welcome_walkthrough_6.png b/astrid/res/drawable/welcome_walkthrough_6.png deleted file mode 100644 index c52027997..000000000 Binary files a/astrid/res/drawable/welcome_walkthrough_6.png and /dev/null differ diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml index 8005db879..5899e9c54 100644 --- a/astrid/res/layout/task_edit_activity.xml +++ b/astrid/res/layout/task_edit_activity.xml @@ -25,55 +25,6 @@ android:gravity="center_horizontal" android:padding="10dip"> - - - - - - - - - - - - notif_default_reminder - - p_rmd_social - field_missed_calls @@ -71,9 +68,7 @@ p_filters_to_show p_show_my_tasks_f p_show_today_f - p_show_waiting_on_me_f p_show_recently_modified_f - p_show_assigned_f p_show_no_list_f @@ -88,7 +83,6 @@ p_menu_items p_show_menu_search - p_show_menu_friends p_show_menu_sync p_show_menu_sort @@ -106,7 +100,7 @@ 0 1 - 2 + 2\ @@ -363,9 +357,6 @@ p_use_filters - - p_show_list_members - -1 @@ -441,7 +432,6 @@ - @string/TEA_control_who @string/TEA_control_when @string/TEA_control_importance @string/TEA_control_lists @@ -455,7 +445,6 @@ TEA_ctrl_title_pref - TEA_ctrl_who_pref TEA_ctrl_when_pref TEA_ctrl_more_pref TEA_ctrl_importance_pref @@ -469,7 +458,6 @@ - @string/TEA_ctrl_who_pref @string/TEA_ctrl_when_pref @string/TEA_ctrl_importance_pref @string/TEA_ctrl_lists_pref diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index bbc840588..4fb26f68c 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -430,9 +430,6 @@ - - Who - When diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml index e775df0b6..11cc70c44 100644 --- a/astrid/res/xml/preferences.xml +++ b/astrid/res/xml/preferences.xml @@ -97,10 +97,6 @@ android:key="@string/p_show_menu_search" android:title="@string/TLA_menu_search" android:defaultValue="true"/> - - - - - - diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java index 1a37fe8b3..07ed02c6c 100644 --- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java @@ -584,9 +584,7 @@ public class EditPreferences extends TodorooPreferenceActivity { findPreference(getString(R.string.p_config_lite)).setOnPreferenceClickListener( new SetDefaultsClickListener(new AstridLitePreferenceSpec(), R.string.EPr_config_lite)); - int[] menuPrefs = {R.string.p_show_menu_search, R.string.p_show_menu_friends, - R.string.p_show_menu_sync, R.string.p_show_menu_sort, - }; + int[] menuPrefs = {R.string.p_show_menu_search, R.string.p_show_menu_sync, R.string.p_show_menu_sort}; for (int key : menuPrefs) { findPreference(getString(key)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED)); } diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 46c288696..5c73899e6 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -65,13 +65,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; @@ -214,9 +212,6 @@ public final class TaskEditFragment extends SherlockFragment implements @Autowired private ActFmPreferenceService actFmPreferenceService; - @Autowired - private WaitingOnMeDao waitingOnMeDao; - @Autowired private UserDao userDao; @@ -742,7 +737,6 @@ public final class TaskEditFragment extends SherlockFragment implements if (model != null) { // came from bundle setIsNewTask(model.getValue(Task.TITLE).length() == 0); - setupWaitingOnMe(); return; } @@ -776,7 +770,6 @@ public final class TaskEditFragment extends SherlockFragment implements } setIsNewTask(model.getValue(Task.TITLE).length() == 0); - setupWaitingOnMe(); if (model == null) { exceptionService.reportError("task-edit-no-task", @@ -790,86 +783,6 @@ public final class TaskEditFragment extends SherlockFragment implements } - 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/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index b6bcc7451..8a7611f70 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -596,10 +596,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener if (tlf != null) { if (data != null) { if (data.getBooleanExtra(TaskEditFragment.TOKEN_TASK_WAS_ASSIGNED, false)) { - String assignedTo = data.getStringExtra(TaskEditFragment.TOKEN_ASSIGNED_TO_DISPLAY); - String assignedEmail = data.getStringExtra(TaskEditFragment.TOKEN_ASSIGNED_TO_EMAIL); - String assignedId = data.getStringExtra(TaskEditFragment.TOKEN_ASSIGNED_TO_ID); - taskAssignedTo(assignedTo, assignedEmail, assignedId); } else if (data.getParcelableExtra(TaskEditFragment.TOKEN_NEW_REPEATING_TASK) != null) { Task repeating = data.getParcelableExtra(TaskEditFragment.TOKEN_NEW_REPEATING_TASK); DateChangedAlerts.showRepeatChangedDialog(this, repeating); @@ -683,91 +679,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener } } - public void taskAssignedTo(final String assignedDisplay, String assignedEmail, final String assignedId) { - final TaskListFragment tlf = getTaskListFragment(); - if (tlf != null && tlf.isInbox()) { - DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Filter assignedFilter = CustomFilterExposer.getAssignedByMeFilter(getResources()); - onFilterItemClicked(assignedFilter); - } - }; - DialogUtilities.okCancelCustomDialog(this, - getString(R.string.actfm_view_task_title), - getString(R.string.actfm_view_task_text, assignedDisplay), - R.string.actfm_view_task_ok, R.string.actfm_view_task_cancel, - 0, okListener, null); - } else if (tlf != null && (!TextUtils.isEmpty(assignedEmail) || Task.isRealUserId(assignedId))) { - checkAddTagMember(tlf, assignedDisplay, assignedEmail, assignedId); - } - } - - private void checkAddTagMember(final TaskListFragment tlf, final String assignedDisplay, String assignedEmail, final String assignedId) { - final TagData td = tlf.getActiveTagData(); - if (td != null) { - String members = td.getValue(TagData.MEMBERS); - - boolean memberFound = false; - if (TextUtils.isEmpty(members)) { - memberFound = td.getValue(TagData.USER_ID).equals(assignedId) || tagMetadataDao.memberOfTagData(assignedEmail, td.getUuid(), assignedId); - } else { - JSONObject user = new JSONObject(); - JSONArray membersArray = null; - try { - if (!TextUtils.isEmpty(assignedEmail)) { - user.put("email", assignedEmail); //$NON-NLS-1$ - } - if (Task.isRealUserId(assignedId)) { - user.put("id", assignedId); //$NON-NLS-1$ - } - membersArray = new JSONArray(members); - - for (int i = 0; i < membersArray.length(); i++) { - JSONObject member = membersArray.getJSONObject(i); - String memberId = Long.toString(member.optLong("id", -3)); //$NON-NLS-1$ - if (Task.isRealUserId(memberId) && memberId.equals(assignedId)) { - memberFound = true; - break; - } - } - - if (!memberFound) { - String ownerString = td.getValue(TagData.USER); - if (!TextUtils.isEmpty(ownerString)) { - JSONObject owner = new JSONObject(ownerString); - String ownerId = Long.toString(owner.optLong("id", -3)); //$NON-NLS-1$ - if (Task.isRealUserId(ownerId) && assignedId.equals(ownerId)) { - memberFound = true; - } - } - } - } catch (JSONException e) { - return; - } - } - - if (memberFound) { - return; - } - - DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface d, int which) { - tagMetadataDao.createMemberLink(td.getId(), td.getUuid(), assignedId, false); - tlf.refresh(); - } - }; - DialogUtilities.okCancelCustomDialog(this, - getString(R.string.actfm_EPA_add_person_to_list_title), - getString(R.string.actfm_EPA_add_person_to_list, assignedDisplay, assignedDisplay), - R.string.actfm_EPA_add_person_to_list_ok, - R.string.actfm_EPA_add_person_to_list_cancel, - android.R.drawable.ic_dialog_alert, - okListener, null); - } - } - public void incrementFilterCount(Filter filter) { FilterListFragment flf = getFilterListFragment(); if (flf != null) { diff --git a/astrid/src/com/todoroo/astrid/dao/Database.java b/astrid/src/com/todoroo/astrid/dao/Database.java index 98002f4f5..b09f6a3a3 100644 --- a/astrid/src/com/todoroo/astrid/dao/Database.java +++ b/astrid/src/com/todoroo/astrid/dao/Database.java @@ -30,8 +30,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; @@ -73,14 +71,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 @@ -394,9 +389,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 1ce47af4e..4a8a5f06d 100644 --- a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java +++ b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java @@ -30,8 +30,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; @@ -87,8 +85,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 2d5a67b5d..d3ee19ec0 100644 --- a/astrid/src/com/todoroo/astrid/service/StartupService.java +++ b/astrid/src/com/todoroo/astrid/service/StartupService.java @@ -50,7 +50,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; @@ -113,9 +112,6 @@ public class StartupService { @Autowired TaskListMetadataDao taskListMetadataDao; - @Autowired - WaitingOnMeDao waitingOnMeDao; - @Autowired MetadataService metadataService; @@ -222,7 +218,7 @@ public class StartupService { final int finalLatestVersion = latestSetVersion; 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 f677020ec..8398f2519 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -251,8 +251,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: diff --git a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java index d02e3955e..bae506d2e 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java @@ -100,13 +100,10 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec { setPreference(prefs, editor, r, R.string.p_rmd_persistent, true, ifUnset); setPreference(prefs, editor, r, R.string.p_show_today_filter, true, ifUnset); - setPreference(prefs, editor, r, R.string.p_show_waiting_on_me_filter, true, ifUnset); setPreference(prefs, editor, r, R.string.p_show_recently_modified_filter, true, ifUnset); - setPreference(prefs, editor, r, R.string.p_show_ive_assigned_filter, true, ifUnset); setPreference(prefs, editor, r, R.string.p_show_not_in_list_filter, true, ifUnset); setPreference(prefs, editor, r, R.string.p_show_menu_search, true, ifUnset); - setPreference(prefs, editor, r, R.string.p_show_menu_friends, true, ifUnset); setPreference(prefs, editor, r, R.string.p_show_menu_sync, true, ifUnset); setPreference(prefs, editor, r, R.string.p_show_menu_sort, true, ifUnset); @@ -114,9 +111,6 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec { setPreference(prefs, editor, r, R.string.p_use_filters, false, ifUnset); - setPreference(prefs, editor, r, R.string.p_show_list_members, true, ifUnset); - setPreference(prefs, editor, r, R.string.p_rmd_social, true, ifUnset); - setPreference(prefs, editor, r, R.string.p_theme, ThemeService.THEME_WHITE, ifUnset); setPreference(prefs, editor, r, R.string.p_force_phone_layout, false, ifUnset); diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java index 15c7449ad..95d5bf918 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java @@ -91,21 +91,15 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec { setPreference(prefs, editor, r, R.string.p_use_filters, false, ifUnset); - setPreference(prefs, editor, r, R.string.p_show_list_members, false, ifUnset); - setPreference(prefs, editor, r, R.string.p_rmd_social, true, ifUnset); - setPreference(prefs, editor, r, R.string.p_theme, ThemeService.THEME_WHITE_ALT, ifUnset); setPreference(prefs, editor, r, R.string.p_force_phone_layout, true, ifUnset); setPreference(prefs, editor, r, R.string.p_show_today_filter, true, ifUnset); - setPreference(prefs, editor, r, R.string.p_show_waiting_on_me_filter, false, ifUnset); setPreference(prefs, editor, r, R.string.p_show_recently_modified_filter, false, ifUnset); - setPreference(prefs, editor, r, R.string.p_show_ive_assigned_filter, false, ifUnset); setPreference(prefs, editor, r, R.string.p_show_not_in_list_filter, false, ifUnset); setPreference(prefs, editor, r, R.string.p_show_menu_search, false, ifUnset); - setPreference(prefs, editor, r, R.string.p_show_menu_friends, false, ifUnset); setPreference(prefs, editor, r, R.string.p_show_menu_sync, false, ifUnset); setPreference(prefs, editor, r, R.string.p_show_menu_sort, true, ifUnset);