From ec10255059901a3581b87582b4f7000d3ee08577 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 8 Mar 2019 11:31:37 -0600
Subject: [PATCH] Fix play store pre-launch report crash

---
 .../todoroo/astrid/activity/TaskListFragment.java  | 14 ++++----------
 .../org/tasks/tasklist/ActionModeProvider.java     |  4 +++-
 2 files changed, 7 insertions(+), 11 deletions(-)

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 a4885b21e..fedf7256c 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -563,17 +563,11 @@ public final class TaskListFragment extends InjectingFragment
     recyclerAdapter.onTaskSaved();
   }
 
-  public void onTaskDelete(List<Task> tasks) {
-    for (Task task : tasks) {
-      onTaskDelete(task);
-    }
-  }
-
-  private void onTaskDelete(Task task) {
+  public void onTaskDelete(Task task) {
     MainActivity activity = (MainActivity) getActivity();
-    TaskEditFragment tef = activity.getTaskEditFragment();
-    if (tef != null) {
-      if (task.getId() == tef.model.getId()) {
+    if (activity != null) {
+      TaskEditFragment tef = activity.getTaskEditFragment();
+      if (tef != null && task.getId() == tef.model.getId()) {
         tef.discard();
       }
     }
diff --git a/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java b/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java
index 16d5e46f4..db859cfa7 100644
--- a/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java
+++ b/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java
@@ -125,7 +125,9 @@ public class ActionModeProvider {
                 List<Long> tasks = adapter.getSelected();
                 taskListRecyclerAdapter.finishActionMode();
                 List<Task> result = taskDeleter.markDeleted(tasks);
-                taskList.onTaskDelete(result);
+                for (Task task : result) {
+                  taskList.onTaskDelete(task);
+                }
                 taskList
                     .makeSnackbar(
                         context.getString(