task presenters in mvp and loaders are now set the same way

malmstein · malmstein · commit d494af23750c · 2016-02-28T18:57:11.000Z
diff --git a/todo-mvp-loaders/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksContract.java b/todo-mvp-loaders/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksContract.java
@@ -65,6 +65,8 @@ interface View {
 
     interface Presenter extends BasePresenter {
 
+        void result(int requestCode, int resultCode);
+
         void loadTasks(boolean forceUpdate);
 
         void addNewTask();
diff --git a/todo-mvp-loaders/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenter.java b/todo-mvp-loaders/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenter.java
@@ -65,6 +65,7 @@ public TasksPresenter(@NonNull TasksLoader loader, @NonNull LoaderManager loader
         mLoaderManager = checkNotNull(loaderManager, "loader manager cannot be null");
         mTasksRepository = checkNotNull(tasksRepository, "tasksRepository cannot be null");
         mTasksView = checkNotNull(tasksView, "tasksView cannot be null!");
+
     }
 
     @Override
diff --git a/todo-mvp-loaders/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/BasePresenter.java b/todo-mvp-loaders/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/BasePresenter.java
@@ -2,8 +2,6 @@
 
 public interface BasePresenter {
 
-    void result(int requestCode, int resultCode);
-
     void resume();
 
     void pause();
diff --git a/todo-mvp-loaders/app/src/test/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenterTest.java b/todo-mvp-loaders/app/src/test/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenterTest.java
@@ -16,22 +16,23 @@
 
 package com.example.android.architecture.blueprints.todoapp.tasks;
 
+import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 
 import com.example.android.architecture.blueprints.todoapp.data.Task;
 import com.example.android.architecture.blueprints.todoapp.data.source.TasksLoader;
 import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository;
 import com.google.common.collect.Lists;
 
+import java.util.List;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.util.List;
-
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Matchers.any;
@@ -61,6 +62,9 @@ public class TasksPresenterTest {
     @Mock
     private TasksLoader mTasksLoader;
 
+    @Mock
+    private LoaderManager mLoaderManager;
+
     private TasksPresenter mTasksPresenter;
 
     @Before
@@ -70,11 +74,12 @@ public void setupTasksPresenter() {
         MockitoAnnotations.initMocks(this);
 
         // Get a reference to the class under test
-        mTasksPresenter = new TasksPresenter(mTasksLoader, mTasksRepository, mTasksView);
+        mTasksPresenter = new TasksPresenter(mTasksLoader, mLoaderManager, mTasksRepository, mTasksView);
 
         // We initialise the tasks to 3, with one active and two completed
         TASKS = Lists.newArrayList(new Task("Title1", "Description1"),
-                new Task("Title2", "Description2", true), new Task("Title3", "Description3", true));
+                                   new Task("Title2", "Description2", true), new Task("Title3", "Description3", true)
+        );
     }
 
     @Test
diff --git a/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivity.java b/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivity.java
@@ -81,6 +81,8 @@ protected void onCreate(Bundle savedInstanceState) {
                     (TasksFilterType) savedInstanceState.getSerializable(CURRENT_FILTERING_KEY);
             mTasksPresenter.setFiltering(currentFiltering);
         }
+
+        tasksFragment.setPresenter(mTasksPresenter);
     }
 
     @Override
diff --git a/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksContract.java b/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksContract.java
@@ -60,15 +60,15 @@ interface View {
 
         void showSuccessfullySavedMessage();
 
-        void setPresenter(Presenter listener);
-
         boolean isActive();
 
         void showFilteringPopUpMenu();
     }
 
     interface Presenter extends BasePresenter {
 
+        void result(int requestCode, int resultCode);
+
         void loadTasks(boolean forceUpdate);
 
         void addNewTask();
diff --git a/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenter.java b/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenter.java
@@ -31,7 +31,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-
 /**
  * Listens to user actions from the UI ({@link TasksFragment}), retrieves the data and updates the
  * UI as required.
@@ -46,11 +45,9 @@ public class TasksPresenter implements TasksContract.Presenter {
 
     private boolean mFirstLoad = true;
 
-    public TasksPresenter(
-            @NonNull TasksRepository tasksRepository, @NonNull TasksContract.View tasksView) {
+    public TasksPresenter(@NonNull TasksRepository tasksRepository, @NonNull TasksContract.View tasksView) {
         mTasksRepository = checkNotNull(tasksRepository, "tasksRepository cannot be null");
         mTasksView = checkNotNull(tasksView, "tasksView cannot be null!");
-        tasksView.setPresenter(this);
     }
 
     @Override
@@ -79,7 +76,7 @@ public void loadTasks(boolean forceUpdate) {
     }
 
     /**
-     * @param forceUpdate Pass in true to refresh the data in the {@link TasksDataSource}
+     * @param forceUpdate   Pass in true to refresh the data in the {@link TasksDataSource}
      * @param showLoadingUI Pass in true to display a loading icon in the UI
      */
     private void loadTasks(boolean forceUpdate, final boolean showLoadingUI) {
@@ -107,7 +104,7 @@ public void onTasksLoaded(List<Task> tasks) {
                 }
 
                 // We filter the tasks based on the requestType
-                for (Task task: tasks) {
+                for (Task task : tasks) {
                     switch (mCurrentFiltering) {
                         case ALL_TASKS:
                             tasksToShow.add(task);
@@ -135,7 +132,7 @@ public void onTasksLoaded(List<Task> tasks) {
                     mTasksView.setLoadingIndicator(false);
                 }
 
-               processTasks(tasksToShow);
+                processTasks(tasksToShow);
             }
 
             @Override
@@ -227,7 +224,7 @@ public void clearCompletedTasks() {
      * Sets the current task filtering type.
      *
      * @param requestType 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(TasksFilterType requestType) {
diff --git a/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/BasePresenter.java b/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/BasePresenter.java
@@ -2,8 +2,6 @@
 
 public interface BasePresenter {
 
-    void result(int requestCode, int resultCode);
-
     void resume();
 
     void pause();

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public TasksPresenter(@NonNull TasksLoader loader, @NonNull LoaderManager loader`
`65`	`65`	`mLoaderManager = checkNotNull(loaderManager, "loader manager cannot be null");`
`66`	`66`	`mTasksRepository = checkNotNull(tasksRepository, "tasksRepository cannot be null");`
`67`	`67`	`mTasksView = checkNotNull(tasksView, "tasksView cannot be null!");`
	`68`	`+`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@ protected void onCreate(Bundle savedInstanceState) {`
`81`	`81`	`(TasksFilterType) savedInstanceState.getSerializable(CURRENT_FILTERING_KEY);`
`82`	`82`	`mTasksPresenter.setFiltering(currentFiltering);`
`83`	`83`	`}`
	`84`	`+`
	`85`	`+ tasksFragment.setPresenter(mTasksPresenter);`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`@Override`