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 d5017e295..3a6aef28e 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -410,7 +410,7 @@ public class TaskListFragment extends InjectingFragment super.onActivityCreated(savedInstanceState); taskListViewModel - .getTasks(filter, taskProperties()) + .getTasks(filter, taskAdapter.getTaskProperties()) .observe( this, list -> { @@ -515,10 +515,6 @@ public class TaskListFragment extends InjectingFragment taskAdapter.setHelper(recyclerAdapter.getAsyncPagedListDiffer()); } - protected Property[] taskProperties() { - return TaskAdapter.PROPERTIES; - } - public Filter getFilter() { return filter; } 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 8c838edd6..25afa5268 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskAdapter.java +++ b/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskAdapter.java @@ -1,7 +1,11 @@ package com.todoroo.astrid.adapter; +import com.todoroo.andlib.data.Property; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.gtasks.GtasksTaskListUpdater; +import java.util.ArrayList; +import java.util.Arrays; +import org.tasks.data.GoogleTask; import org.tasks.data.GoogleTaskList; import timber.log.Timber; @@ -64,4 +68,12 @@ public final class GoogleTaskAdapter extends TaskAdapter { Timber.e(e); } } + + @Override + public Property[] getTaskProperties() { + ArrayList> properties = new ArrayList<>(Arrays.asList(TaskAdapter.PROPERTIES)); + properties.add(GoogleTask.ORDER); + properties.add(GoogleTask.INDENT); + return properties.toArray(new Property[properties.size()]); + } } 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 1151369b9..477d6a2fa 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -129,6 +129,10 @@ public class TaskAdapter { this.onCompletedTaskListener = newListener; } + public Property[] getTaskProperties() { + return PROPERTIES; + } + 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 78666a800..2fb3485b8 100644 --- a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java @@ -8,15 +8,11 @@ package com.todoroo.astrid.gtasks; import android.app.Activity; import android.os.Bundle; -import com.todoroo.andlib.data.Property; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.data.Task; -import java.util.ArrayList; -import java.util.Arrays; import javax.inject.Inject; -import org.tasks.data.GoogleTask; import org.tasks.data.GoogleTaskList; import org.tasks.injection.FragmentComponent; import org.tasks.tasklist.GtasksListFragment; @@ -46,15 +42,6 @@ public class GtasksSubtaskListFragment extends GtasksListFragment { helper.onDeleteTask(task); } - @Override - public Property[] taskProperties() { - Property[] baseProperties = TaskAdapter.PROPERTIES; - ArrayList> properties = new ArrayList<>(Arrays.asList(baseProperties)); - properties.add(GoogleTask.ORDER); - properties.add(GoogleTask.INDENT); - return properties.toArray(new Property[properties.size()]); - } - @Override public void onAttach(Activity activity) { super.onAttach(activity);