Fix voice notifications, finished activity crash

pull/321/head 4.7.15
Alex Baker 9 years ago
parent e1ca0ca620
commit e08735106f

@ -27,8 +27,8 @@ android {
buildToolsVersion "22.0.1" buildToolsVersion "22.0.1"
defaultConfig { defaultConfig {
versionCode 370 versionCode 371
versionName "4.7.14" versionName "4.7.15"
minSdkVersion 7 minSdkVersion 7
targetSdkVersion 22 targetSdkVersion 22
} }

@ -583,9 +583,14 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr
* broadcast. Subclasses should override this. * broadcast. Subclasses should override this.
*/ */
protected void refresh() { protected void refresh() {
TaskEditFragment taskEditFragment = ((AstridActivity) getActivity()).getTaskEditFragment(); try {
AstridActivity astridActivity = (AstridActivity) getActivity();
TaskEditFragment taskEditFragment = astridActivity == null ? null : astridActivity.getTaskEditFragment();
Task model = taskEditFragment == null ? null : taskEditFragment.model; Task model = taskEditFragment == null ? null : taskEditFragment.model;
taskDeleter.deleteTasksWithEmptyTitles(model == null ? null : model.getId()); taskDeleter.deleteTasksWithEmptyTitles(model == null ? null : model.getId());
} catch(Exception e) {
log.error(e.getMessage(), e);
}
loadTaskListContent(); loadTaskListContent();
setSyncOngoing(false); setSyncOngoing(false);
} }

@ -224,7 +224,7 @@ public class Notifier {
final String taskTitle = task.getTitle(); final String taskTitle = task.getTitle();
boolean nonstopMode = task.isNotifyModeNonstop(); boolean nonstopMode = task.isNotifyModeNonstop();
boolean ringFiveMode = task.isNotifyModeFive(); boolean ringFiveMode = task.isNotifyModeFive();
final int ringTimes = nonstopMode ? -1 : (ringFiveMode ? 5 : 1); int ringTimes = nonstopMode ? -1 : (ringFiveMode ? 5 : 1);
// update last reminder time // update last reminder time
task.setReminderLast(DateUtilities.now()); task.setReminderLast(DateUtilities.now());
@ -239,10 +239,9 @@ public class Notifier {
putExtra(NotificationActivity.EXTRA_TITLE, taskTitle); putExtra(NotificationActivity.EXTRA_TITLE, taskTitle);
}}; }};
int ringTimes1 = ringTimes;
// don't ring multiple times if random reminder // don't ring multiple times if random reminder
if (type == ReminderService.TYPE_RANDOM) { if (type == ReminderService.TYPE_RANDOM) {
ringTimes1 = 1; ringTimes = 1;
} }
NotificationCompat.Builder builder = new NotificationCompat.Builder(context) 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); .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; return true;
} }

Loading…
Cancel
Save