Merge branch 'master' into commonPresenterLifecycle

malmstein · malmstein · commit d06e7badee71 · 2016-02-29T16:46:11.000Z
diff --git a/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskPresenter.java b/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskPresenter.java
@@ -66,7 +66,7 @@ public void populateTask(String taskId) {
 
     @Override
     public void onTaskLoaded(Task task) {
-        // The View may not be on screen anymore when this callback is returned
+        // The view may not be able to handle UI updates anymore
         if (mAddTaskView.isActive()) {
             mAddTaskView.setTitle(task.getTitle());
             mAddTaskView.setDescription(task.getDescription());
@@ -75,7 +75,7 @@ public void onTaskLoaded(Task task) {
 
     @Override
     public void onDataNotAvailable() {
-        // The View may not be on screen anymore when this callback is returned
+        // The view may not be able to handle UI updates anymore
         if (mAddTaskView.isActive()) {
             mAddTaskView.showEmptyTaskError();
         }
diff --git a/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsPresenter.java b/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsPresenter.java
@@ -77,7 +77,7 @@ public void onTasksLoaded(List<Task> tasks) {
                         activeTasks += 1;
                     }
                 }
-                // The View may not be on screen anymore when this callback is returned
+                // The view may not be able to handle UI updates anymore
                 if (!mStatisticsView.isActive()) {
                     return;
                 }
@@ -88,7 +88,7 @@ public void onTasksLoaded(List<Task> tasks) {
 
             @Override
             public void onDataNotAvailable() {
-                // The View may not be on screen anymore when this callback is returned
+                // The view may not be able to handle UI updates anymore
                 if (!mStatisticsView.isActive()) {
                     return;
                 }
diff --git a/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailPresenter.java b/todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailPresenter.java
@@ -62,7 +62,7 @@ private void openTask() {
         mTasksRepository.getTask(mTaskId, new TasksDataSource.GetTaskCallback() {
             @Override
             public void onTaskLoaded(Task task) {
-                // The View may not be on screen anymore when this callback is returned
+                // The view may not be able to handle UI updates anymore
                 if (!mTaskDetailView.isActive()) {
                     return;
                 }
@@ -76,7 +76,7 @@ public void onTaskLoaded(Task task) {
 
             @Override
             public void onDataNotAvailable() {
-                // The View may not be on screen anymore when this callback is returned
+                // The view may not be able to handle UI updates anymore
                 if (!mTaskDetailView.isActive()) {
                     return;
                 }
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
@@ -119,7 +119,7 @@ public void onTasksLoaded(List<Task> tasks) {
                             break;
                     }
                 }
-                // The View may not be on screen anymore when this callback is returned
+                // The view may not be able to handle UI updates anymore
                 if (!mTasksView.isActive()) {
                     return;
                 }
@@ -132,7 +132,7 @@ public void onTasksLoaded(List<Task> tasks) {
 
             @Override
             public void onDataNotAvailable() {
-                // The View may not be on screen anymore when this callback is returned
+                // The view may not be able to handle UI updates anymore
                 if (!mTasksView.isActive()) {
                     return;
                 }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public void onTasksLoaded(List<Task> tasks) {`
`77`	`77`	`activeTasks += 1;`
`78`	`78`	`}`
`79`	`79`	`}`
`80`		`- // The View may not be on screen anymore when this callback is returned`
	`80`	`+ // The view may not be able to handle UI updates anymore`
`81`	`81`	`if (!mStatisticsView.isActive()) {`
`82`	`82`	`return;`
`83`	`83`	`}`
`@@ -88,7 +88,7 @@ public void onTasksLoaded(List<Task> tasks) {`
`88`	`88`
`89`	`89`	`@Override`
`90`	`90`	`public void onDataNotAvailable() {`
`91`		`- // The View may not be on screen anymore when this callback is returned`
	`91`	`+ // The view may not be able to handle UI updates anymore`
`92`	`92`	`if (!mStatisticsView.isActive()) {`
`93`	`93`	`return;`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public void onTasksLoaded(List<Task> tasks) {`
`119`	`119`	`break;`
`120`	`120`	`}`
`121`	`121`	`}`
`122`		`- // The View may not be on screen anymore when this callback is returned`
	`122`	`+ // The view may not be able to handle UI updates anymore`
`123`	`123`	`if (!mTasksView.isActive()) {`
`124`	`124`	`return;`
`125`	`125`	`}`
`@@ -132,7 +132,7 @@ public void onTasksLoaded(List<Task> tasks) {`
`132`	`132`
`133`	`133`	`@Override`
`134`	`134`	`public void onDataNotAvailable() {`
`135`		`- // The View may not be on screen anymore when this callback is returned`
	`135`	`+ // The view may not be able to handle UI updates anymore`
`136`	`136`	`if (!mTasksView.isActive()) {`
`137`	`137`	`return;`
`138`	`138`	`}`