Use notification timestamp when pressing "no"

Fixes #969.
4 years ago · 64d429ab27
parent 43921721d4
commit 64d429ab27
2 changed files with 3 additions and 2 deletions
--- 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
        )
--- 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(