Merge pull request #443 from FossifyOrg/fix_task_completion_button

Fix "Mark completed" notification button
FossifyOrg · Jan 24, 2025 · f97b3ca · f97b3ca
2 parents 9d6936b + 561330e
commit f97b3ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/app/src/main/kotlin/org/fossify/calendar/extensions/Context.kt b/app/src/main/kotlin/org/fossify/calendar/extensions/Context.kt
@@ -473,6 +473,7 @@ private fun getSnoozePendingIntent(context: Context, event: Event): PendingInten
 private fun getMarkCompletedPendingIntent(context: Context, task: Event): PendingIntent {
     val intent = Intent(context, MarkCompletedService::class.java).setAction(ACTION_MARK_COMPLETED)
     intent.putExtra(EVENT_ID, task.id)
+    intent.putExtra(EVENT_OCCURRENCE_TS, task.startTS)
     return PendingIntent.getService(context, task.id!!.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
 }
 
@@ -946,4 +947,4 @@ fun Context.getWeekNumberWidth(): Int {
     } else {
         0
     }
-}
+}
diff --git a/app/src/main/kotlin/org/fossify/calendar/services/MarkCompletedService.kt b/app/src/main/kotlin/org/fossify/calendar/services/MarkCompletedService.kt
@@ -4,18 +4,28 @@ import android.app.IntentService
 import android.content.Intent
 import org.fossify.calendar.extensions.eventsDB
 import org.fossify.calendar.extensions.updateTaskCompletion
+import org.fossify.calendar.extensions.updateWidgets
 import org.fossify.calendar.helpers.ACTION_MARK_COMPLETED
 import org.fossify.calendar.helpers.EVENT_ID
+import org.fossify.calendar.helpers.EVENT_OCCURRENCE_TS
 
 class MarkCompletedService : IntentService("MarkCompleted") {
 
     @Deprecated("Deprecated in Java")
     override fun onHandleIntent(intent: Intent?) {
         if (intent != null && intent.action == ACTION_MARK_COMPLETED) {
             val taskId = intent.getLongExtra(EVENT_ID, 0L)
-            val task = eventsDB.getTaskWithId(taskId)
+            val task = eventsDB.getTaskWithId(taskId)?.apply {
+                val occurrenceTS = intent.getLongExtra(EVENT_OCCURRENCE_TS, 0L)
+                if (occurrenceTS != 0L) {
+                    startTS = occurrenceTS
+                    endTS = occurrenceTS
+                }
+            }
+
             if (task != null) {
                 updateTaskCompletion(task, completed = true)
+                updateWidgets()
             }
         }
     }