From e08735106f7d17194e742115d82929b6eebbaa4c Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Mon, 13 Jul 2015 13:37:26 -0500
Subject: [PATCH] Fix voice notifications, finished activity crash

---
 build.gradle                                          |  4 ++--
 .../com/todoroo/astrid/activity/TaskListFragment.java | 11 ++++++++---
 src/main/java/org/tasks/Notifier.java                 |  7 +++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index bcdcef536..26f9931c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,8 +27,8 @@ android {
     buildToolsVersion "22.0.1"
 
     defaultConfig {
-        versionCode 370
-        versionName "4.7.14"
+        versionCode 371
+        versionName "4.7.15"
         minSdkVersion 7
         targetSdkVersion 22
     }
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index e1481e77c..85ff3401f 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -583,9 +583,14 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr
      * broadcast. Subclasses should override this.
      */
     protected void refresh() {
-        TaskEditFragment taskEditFragment = ((AstridActivity) getActivity()).getTaskEditFragment();
-        Task model = taskEditFragment == null ? null : taskEditFragment.model;
-        taskDeleter.deleteTasksWithEmptyTitles(model == null ? null : model.getId());
+        try {
+            AstridActivity astridActivity = (AstridActivity) getActivity();
+            TaskEditFragment taskEditFragment = astridActivity == null ? null : astridActivity.getTaskEditFragment();
+            Task model = taskEditFragment == null ? null : taskEditFragment.model;
+            taskDeleter.deleteTasksWithEmptyTitles(model == null ? null : model.getId());
+        } catch(Exception e) {
+            log.error(e.getMessage(), e);
+        }
         loadTaskListContent();
         setSyncOngoing(false);
     }
diff --git a/src/main/java/org/tasks/Notifier.java b/src/main/java/org/tasks/Notifier.java
index 9a0a1a075..cf46d778f 100644
--- a/src/main/java/org/tasks/Notifier.java
+++ b/src/main/java/org/tasks/Notifier.java
@@ -224,7 +224,7 @@ public class Notifier {
         final String taskTitle = task.getTitle();
         boolean nonstopMode = task.isNotifyModeNonstop();
         boolean ringFiveMode = task.isNotifyModeFive();
-        final int ringTimes = nonstopMode ? -1 : (ringFiveMode ? 5 : 1);
+        int ringTimes = nonstopMode ? -1 : (ringFiveMode ? 5 : 1);
 
         // update last reminder time
         task.setReminderLast(DateUtilities.now());
@@ -239,10 +239,9 @@ public class Notifier {
             putExtra(NotificationActivity.EXTRA_TITLE, taskTitle);
         }};
 
-        int ringTimes1 = ringTimes;
         // don't ring multiple times if random reminder
         if (type == ReminderService.TYPE_RANDOM) {
-            ringTimes1 = 1;
+            ringTimes = 1;
         }
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
@@ -266,7 +265,7 @@ public class Notifier {
                     .addAction(R.drawable.ic_snooze_white_24dp, context.getResources().getString(R.string.rmd_NoA_snooze), snoozePendingIntent);
         }
 
-        activateNotification(ringTimes1, (int) id, builder.build(), text);
+        activateNotification(ringTimes, (int) id, builder.build(), taskTitle);
 
         return true;
     }