diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 5e18738ea..953388791 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -547,7 +547,7 @@ public class TaskListFragment extends InjectingFragment } } - protected void onTaskDelete(Task task) { + private void onTaskDelete(Task task) { MainActivity activity = (MainActivity) getActivity(); TaskEditFragment tef = activity.getTaskEditFragment(); if (tef != null) { @@ -556,6 +556,8 @@ public class TaskListFragment extends InjectingFragment } } timerPlugin.stopTimer(task); + taskAdapter.onTaskDeleted(task); + loadTaskListContent(); } @Override diff --git a/app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.java index 6fdac73ef..b5c50e708 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.java +++ b/app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.java @@ -74,4 +74,9 @@ public final class AstridTaskAdapter extends TaskAdapter { public void onTaskCreated(String uuid) { updater.onCreateTask(list, filter, uuid); } + + @Override + public void onTaskDeleted(Task task) { + updater.onDeleteTask(list, filter, task.getUuid()); + } } diff --git a/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskAdapter.java index 25afa5268..cb56cf78b 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskAdapter.java +++ b/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskAdapter.java @@ -76,4 +76,9 @@ public final class GoogleTaskAdapter extends TaskAdapter { properties.add(GoogleTask.INDENT); return properties.toArray(new Property[properties.size()]); } + + @Override + public void onTaskDeleted(Task task) { + updater.onDeleteTask(list, task.getId()); + } } diff --git a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index cf7198ade..700b78a61 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -137,6 +137,10 @@ public class TaskAdapter { } + public void onTaskDeleted(Task task) { + + } + public interface OnCompletedTaskListener { void onCompletedTask(Task item, boolean newState); diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java index 2fb3485b8..483bc114e 100644 --- a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java @@ -36,12 +36,6 @@ public class GtasksSubtaskListFragment extends GtasksListFragment { helper.setList(list); } - @Override - protected void onTaskDelete(Task task) { - super.onTaskDelete(task); - helper.onDeleteTask(task); - } - @Override public void onAttach(Activity activity) { super.onAttach(activity); diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java index a8e8a13dd..b241ccc2b 100644 --- a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java +++ b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java @@ -360,7 +360,7 @@ public class GtasksTaskListUpdater { // --- task cascading operations /** Removes a task from the order hierarchy and un-indent children */ - void onDeleteTask(GoogleTaskList list, final long targetTaskId) { + public void onDeleteTask(GoogleTaskList list, final long targetTaskId) { if (list == null) { return; } diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java b/app/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java index 1fe51ea18..6ede3fce1 100644 --- a/app/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java +++ b/app/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java @@ -103,9 +103,4 @@ class OrderedMetadataListFragmentHelper { public void setList(GoogleTaskList list) { this.list = list; } - - void onDeleteTask(Task task) { - updater.onDeleteTask(list, task.getId()); - fragment.loadTaskListContent(); - } } diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index 4e58ab530..2bd6a6933 100644 --- a/app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -96,9 +96,4 @@ class AstridOrderedListFragmentHelper { public void setList(TaskListMetadata list) { this.list = list; } - - void onDeleteTask(Task task) { - updater.onDeleteTask(list, fragment.getFilter(), task.getUuid()); - fragment.loadTaskListContent(); - } } diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java index efbf04be4..2a8f333dd 100644 --- a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java +++ b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java @@ -425,7 +425,7 @@ public class SubtasksFilterUpdater { applyToFilter(filter); } - void onDeleteTask(TaskListMetadata list, Filter filter, String taskId) { + public void onDeleteTask(TaskListMetadata list, Filter filter, String taskId) { Node task = idToNode.get(taskId); if (task == null) { return; diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java index 836cacd03..fea71b3b5 100644 --- a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java @@ -84,12 +84,6 @@ public class SubtasksListFragment extends TaskListFragment { return taskListMetadata; } - @Override - protected void onTaskDelete(Task task) { - super.onTaskDelete(task); - helper.onDeleteTask(task); - } - @Override protected TaskAdapter createTaskAdapter() { return helper.createTaskAdapter(); diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java index aa19aeb33..1c4b8b8c8 100644 --- a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java @@ -53,12 +53,6 @@ public class SubtasksTagListFragment extends TagListFragment { super.setTaskAdapter(); } - @Override - protected void onTaskDelete(Task task) { - super.onTaskDelete(task); - helper.onDeleteTask(task); - } - @Override protected TaskAdapter createTaskAdapter() { return helper.createTaskAdapter();