malmstein · malmstein · commit 34cb43a63488 · 2016-04-12T15:38:06.000+01:00
the filter is now part of the constructor
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivity.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivity.java
@@ -82,7 +82,8 @@ protected void onCreate(Bundle savedInstanceState) {
         mTasksPresenter = new TasksPresenter(
                 tasksOperations,
                 repository,
-                tasksFragment
+                tasksFragment,
+                TaskFilter.from(TasksFilterType.ALL_TASKS)
         );
 
         // Load previously saved state, if available.
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenter.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenter.java
@@ -49,10 +49,11 @@ public class TasksPresenter implements TasksContract.Presenter, TasksOperations.
     private boolean mFirstLoad;
 
     public TasksPresenter(@NonNull TasksOperations tasksOperations, @NonNull TasksRepository tasksRepository,
-                          @NonNull TasksContract.View tasksView) {
+                          @NonNull TasksContract.View tasksView, @NonNull TaskFilter taskFilter) {
         mTasksOperations = checkNotNull(tasksOperations, "taskOperations provider cannot be null");
         mTasksRepository = checkNotNull(tasksRepository, "tasksRepository cannot be null");
         mTasksView = checkNotNull(tasksView, "tasksView cannot be null!");
+        mCurrentFiltering = checkNotNull(taskFilter, "taskFilter cannot be null!");
         mTasksView.setPresenter(this);
     }
 
@@ -73,7 +74,7 @@ public void start() {
     @Override
     public void onTasksLoaded(Cursor data) {
         mTasksView.setLoadingIndicator(false);
-        if ((null == data) || (data.getCount() > 0)) {
+        if (data.getCount() > 0) {
             // Show the list of tasks
             mTasksView.showTasks(data);
             // Set the filter label's text.
@@ -165,7 +166,7 @@ public void clearCompletedTasks() {
      * Sets the current task filtering type.
      *
      * @param taskFilter Can be {@link TasksFilterType#ALL_TASKS},
-     *                    {@link TasksFilterType#COMPLETED_TASKS}, or {@link TasksFilterType#ACTIVE_TASKS}
+     *                   {@link TasksFilterType#COMPLETED_TASKS}, or {@link TasksFilterType#ACTIVE_TASKS}
      */
     @Override
     public void setFiltering(TaskFilter taskFilter) {
diff --git a/todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenterTest.java b/todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenterTest.java
@@ -80,8 +80,12 @@ public void setupTasksPresenter() {
         // inject the mocks in the test the initMocks method needs to be called.
         MockitoAnnotations.initMocks(this);
 
+        // Given a task filter
+        when(mBundle.getSerializable(TasksOperations.KEY_TASK_FILTER)).thenReturn(TasksFilterType.ALL_TASKS);
+        TaskFilter taskFilter = new TaskFilter(mBundle);
+
         // Get a reference to the class under test
-        mTasksPresenter = new TasksPresenter(mTasksOperations, mTasksRepository, mTasksView);
+        mTasksPresenter = new TasksPresenter(mTasksOperations, mTasksRepository, mTasksView, taskFilter);
 
         mCompletedTasksCursor = MockCursorProvider.createCompletedTasksCursor();
         mActiveTasksCursor = MockCursorProvider.createActiveTasksCursor();
