fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

cancel pending intents at event deletion, related to #1037

Browse Source
This commit is contained in:
tibbi
2021-05-14 21:06:26 +02:00
parent 76587bf01f
commit 07fc73db80
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
View File

@ -136,7 +136,7 @@ fun Context.scheduleEventIn(notifTS: Long, event: Event, showToasts: Boolean) {
toast(msg) toast(msg)
} }
val pendingIntent = getNotificationIntent(applicationContext, event) val pendingIntent = getNotificationIntent(event)
val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
try { try {
AlarmManagerCompat.setExactAndAllowWhileIdle(alarmManager, AlarmManager.RTC_WAKEUP, newNotifTS, pendingIntent) AlarmManagerCompat.setExactAndAllowWhileIdle(alarmManager, AlarmManager.RTC_WAKEUP, newNotifTS, pendingIntent)
@ -145,15 +145,21 @@ fun Context.scheduleEventIn(notifTS: Long, event: Event, showToasts: Boolean) {
} }
} }
// hide the actual notification from the top bar
fun Context.cancelNotification(id: Long) { fun Context.cancelNotification(id: Long) {
(getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(id.toInt()) (getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(id.toInt())
} }
private fun getNotificationIntent(context: Context, event: Event): PendingIntent { fun Context.getNotificationIntent(event: Event): PendingIntent {
val intent = Intent(context, NotificationReceiver::class.java) val intent = Intent(this, NotificationReceiver::class.java)
intent.putExtra(EVENT_ID, event.id) intent.putExtra(EVENT_ID, event.id)
intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS) intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
return PendingIntent.getBroadcast(context, event.id!!.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) return PendingIntent.getBroadcast(this, event.id!!.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
}
fun Context.cancelPendingIntent(id: Long) {
val intent = Intent(this, NotificationReceiver::class.java)
PendingIntent.getBroadcast(this, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT).cancel()
} }
fun Context.getRepetitionText(seconds: Int) = when (seconds) { fun Context.getRepetitionText(seconds: Int) = when (seconds) {
@ -329,6 +335,7 @@ private fun getSnoozePendingIntent(context: Context, event: Event): PendingInten
fun Context.rescheduleReminder(event: Event?, minutes: Int) { fun Context.rescheduleReminder(event: Event?, minutes: Int) {
if (event != null) { if (event != null) {
cancelPendingIntent(event.id!!)
applicationContext.scheduleEventIn(System.currentTimeMillis() + minutes * 60000, event, false) applicationContext.scheduleEventIn(System.currentTimeMillis() + minutes * 60000, event, false)
cancelNotification(event.id!!) cancelNotification(event.id!!)
} }

1
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/EventsHelper.kt
View File

@ -152,6 +152,7 @@ class EventsHelper(val context: Context) {
it.forEach { it.forEach {
context.cancelNotification(it) context.cancelNotification(it)
context.cancelPendingIntent(it)
} }
if (deleteFromCalDAV && config.caldavSync) { if (deleteFromCalDAV && config.caldavSync) {