From 93b442332d15a07ce93012ef8f17dddccbad9c48 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sun, 19 Jun 2016 09:08:34 -0400 Subject: [PATCH] Bugfix: add check on correct date when checking from notification --- .../org/isoron/uhabits/HabitBroadcastReceiver.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java b/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java index e1a45aa5e..23ded62da 100644 --- a/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java +++ b/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java @@ -172,7 +172,8 @@ public class HabitBroadcastReceiver extends BroadcastReceiver Intent contentIntent = new Intent(context, MainActivity.class); contentIntent.setData(data); PendingIntent contentPendingIntent = - PendingIntent.getActivity(context, 0, contentIntent, 0); + PendingIntent.getActivity(context, 0, contentIntent, + PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent dismissPendingIntent = buildDismissIntent(context); PendingIntent checkIntentPending = buildCheckIntent(context, habit, timestamp); @@ -222,7 +223,7 @@ public class HabitBroadcastReceiver extends BroadcastReceiver Intent snoozeIntent = new Intent(context, HabitBroadcastReceiver.class); snoozeIntent.setData(data); snoozeIntent.setAction(ACTION_SNOOZE); - return PendingIntent.getBroadcast(context, 0, snoozeIntent, 0); + return PendingIntent.getBroadcast(context, 0, snoozeIntent, PendingIntent.FLAG_CANCEL_CURRENT); } public static PendingIntent buildCheckIntent(Context context, Habit habit, Long timestamp) @@ -232,14 +233,16 @@ public class HabitBroadcastReceiver extends BroadcastReceiver checkIntent.setData(data); checkIntent.setAction(ACTION_CHECK); if(timestamp != null) checkIntent.putExtra("timestamp", timestamp); - return PendingIntent.getBroadcast(context, 0, checkIntent, PendingIntent.FLAG_ONE_SHOT); + return PendingIntent.getBroadcast(context, 0, checkIntent, + PendingIntent.FLAG_CANCEL_CURRENT); } public static PendingIntent buildDismissIntent(Context context) { Intent deleteIntent = new Intent(context, HabitBroadcastReceiver.class); deleteIntent.setAction(ACTION_DISMISS); - return PendingIntent.getBroadcast(context, 0, deleteIntent, 0); + return PendingIntent.getBroadcast(context, 0, deleteIntent, + PendingIntent.FLAG_CANCEL_CURRENT); } public static PendingIntent buildViewHabitIntent(Context context, Habit habit)