From 271de59a94ae540149fd60c293dffdcdcfb98f08 Mon Sep 17 00:00:00 2001 From: Quentin Hibon Date: Fri, 30 Jul 2021 21:09:25 +0200 Subject: [PATCH] Use notification timestamp when pressing "no" Fixes #969. --- .../java/org/isoron/uhabits/intents/PendingIntentFactory.kt | 3 ++- .../isoron/uhabits/notifications/AndroidNotificationTray.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt index 0a195d9c0..9ee9fd23e 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt @@ -63,13 +63,14 @@ class PendingIntentFactory FLAG_UPDATE_CURRENT ) - fun removeRepetition(habit: Habit): PendingIntent = + fun removeRepetition(habit: Habit, timestamp: Timestamp?): PendingIntent = getBroadcast( context, 3, Intent(context, WidgetReceiver::class.java).apply { action = WidgetReceiver.ACTION_REMOVE_REPETITION data = Uri.parse(habit.uriString) + if (timestamp != null) putExtra("timestamp", timestamp.unixTime) }, FLAG_UPDATE_CURRENT ) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt index de1c23d24..04f3d8d92 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt @@ -107,7 +107,7 @@ class AndroidNotificationTray val removeRepetitionAction = Action( R.drawable.ic_action_cancel, context.getString(R.string.no), - pendingIntents.removeRepetition(habit) + pendingIntents.removeRepetition(habit, timestamp) ) val enterAction = Action(