From 2180a5a8ef329c7dad5c4d66b8515c81cc3ce432 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 9 Jul 2015 11:09:08 -0500 Subject: [PATCH] Fix task edit screen showing up twice --- .../astrid/activity/TaskListFragment.java | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index ea276537b..e1481e77c 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -63,6 +63,7 @@ import com.todoroo.astrid.service.TaskDuplicator; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.subtasks.SubtasksHelper; import com.todoroo.astrid.subtasks.SubtasksListFragment; +import com.todoroo.astrid.subtasks.SubtasksTagListFragment; import com.todoroo.astrid.subtasks.SubtasksUpdater; import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.timers.TimerPlugin; @@ -319,23 +320,25 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr getListView().setItemsCanFocus(false); } - if (!(this instanceof SubtasksListFragment)) { - getListView().setOnItemClickListener(new OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, - int position, long id) { - if (taskAdapter != null) { - TodorooCursor cursor = (TodorooCursor) taskAdapter.getItem(position); - Task task = new Task(cursor); - if (task.isDeleted()) { - return; - } + if ((this instanceof SubtasksListFragment) || (this instanceof SubtasksTagListFragment)) { + return; + } - onTaskListItemClicked(id); + getListView().setOnItemClickListener(new OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, + int position, long id) { + if (taskAdapter != null) { + TodorooCursor cursor = (TodorooCursor) taskAdapter.getItem(position); + Task task = new Task(cursor); + if (task.isDeleted()) { + return; } + + onTaskListItemClicked(id); } - }); - } + } + }); } /**