isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bugfix: add check on correct date when checking from notification

Browse Source
pull/138/merge
Alinson S. Xavier 9 years ago
parent e248824bcd
commit 93b442332d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File

11
app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java
Unescape View File

@ -172,7 +172,8 @@ public class HabitBroadcastReceiver extends BroadcastReceiver
Intent contentIntent = new Intent(context, MainActivity.class); Intent contentIntent = new Intent(context, MainActivity.class);
contentIntent.setData(data); contentIntent.setData(data);
PendingIntent contentPendingIntent = PendingIntent contentPendingIntent =
PendingIntent.getActivity(context, 0, contentIntent, 0); PendingIntent.getActivity(context, 0, contentIntent,
PendingIntent.FLAG_CANCEL_CURRENT);
PendingIntent dismissPendingIntent = buildDismissIntent(context); PendingIntent dismissPendingIntent = buildDismissIntent(context);
PendingIntent checkIntentPending = buildCheckIntent(context, habit, timestamp); PendingIntent checkIntentPending = buildCheckIntent(context, habit, timestamp);
@ -222,7 +223,7 @@ public class HabitBroadcastReceiver extends BroadcastReceiver
Intent snoozeIntent = new Intent(context, HabitBroadcastReceiver.class); Intent snoozeIntent = new Intent(context, HabitBroadcastReceiver.class);
snoozeIntent.setData(data); snoozeIntent.setData(data);
snoozeIntent.setAction(ACTION_SNOOZE); 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) public static PendingIntent buildCheckIntent(Context context, Habit habit, Long timestamp)
@ -232,14 +233,16 @@ public class HabitBroadcastReceiver extends BroadcastReceiver
checkIntent.setData(data); checkIntent.setData(data);
checkIntent.setAction(ACTION_CHECK); checkIntent.setAction(ACTION_CHECK);
if(timestamp != null) checkIntent.putExtra("timestamp", timestamp); 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) public static PendingIntent buildDismissIntent(Context context)
{ {
Intent deleteIntent = new Intent(context, HabitBroadcastReceiver.class); Intent deleteIntent = new Intent(context, HabitBroadcastReceiver.class);
deleteIntent.setAction(ACTION_DISMISS); 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) public static PendingIntent buildViewHabitIntent(Context context, Habit habit)

Write Preview
Loading…
Cancel
Save