isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix check button for previous day reminders

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-02-27 05:44:14 -05:00
parent 6a1cb09ca2
commit 88455acc76
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java
View File

@@ -97,10 +97,7 @@ public class ReminderAlarmReceiver extends BroadcastReceiver
private void checkHabit(Context context, Intent intent) private void checkHabit(Context context, Intent intent)
{ {
Uri data = intent.getData(); Uri data = intent.getData();
Long timestamp = DateHelper.getStartOfToday(); Long timestamp = intent.getLongExtra("timestamp", DateHelper.getStartOfToday());
String paramTimestamp = data.getQueryParameter("timestamp");
if(paramTimestamp != null) timestamp = Long.parseLong(paramTimestamp);
Habit habit = Habit.get(ContentUris.parseId(data)); Habit habit = Habit.get(ContentUris.parseId(data));
habit.toggleRepetition(timestamp); habit.toggleRepetition(timestamp);
@@ -131,6 +128,8 @@ public class ReminderAlarmReceiver extends BroadcastReceiver
{ {
Uri data = intent.getData(); Uri data = intent.getData();
Habit habit = Habit.get(ContentUris.parseId(data)); Habit habit = Habit.get(ContentUris.parseId(data));
Long timestamp = intent.getLongExtra("timestamp", DateHelper.getStartOfToday());
Long reminderTime = intent.getLongExtra("reminderTime", DateHelper.getStartOfToday());
if (habit.hasImplicitRepToday()) return; if (habit.hasImplicitRepToday()) return;
@@ -154,7 +153,9 @@ public class ReminderAlarmReceiver extends BroadcastReceiver
Intent checkIntent = new Intent(context, ReminderAlarmReceiver.class); Intent checkIntent = new Intent(context, ReminderAlarmReceiver.class);
checkIntent.setData(data); checkIntent.setData(data);
checkIntent.setAction(ACTION_CHECK); checkIntent.setAction(ACTION_CHECK);
PendingIntent checkIntentPending = PendingIntent.getBroadcast(context, 0, checkIntent, 0); checkIntent.putExtra("timestamp", timestamp);
PendingIntent checkIntentPending =
PendingIntent.getBroadcast(context, 0, checkIntent, PendingIntent.FLAG_ONE_SHOT);
Intent snoozeIntent = new Intent(context, ReminderAlarmReceiver.class); Intent snoozeIntent = new Intent(context, ReminderAlarmReceiver.class);
snoozeIntent.setData(data); snoozeIntent.setData(data);
@@ -163,8 +164,6 @@ public class ReminderAlarmReceiver extends BroadcastReceiver
Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
Long reminderTime = intent.getLongExtra("reminderTime", DateHelper.getStartOfToday());
NotificationCompat.WearableExtender wearableExtender = NotificationCompat.WearableExtender wearableExtender =
new NotificationCompat.WearableExtender().setBackground( new NotificationCompat.WearableExtender().setBackground(
BitmapFactory.decodeResource(context.getResources(), R.drawable.stripe)); BitmapFactory.decodeResource(context.getResources(), R.drawable.stripe));