fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-01-20 21:01:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

open proper event occurrence from the notification

Browse Source
This commit is contained in:
tibbi 2017-06-14 21:18:51 +02:00
parent b4e935722c
commit e6ec7d8210
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ fun Context.scheduleEventIn(notifTS: Long, event: Event) {
if (notifTS < System.currentTimeMillis())
return
val pendingIntent = getNotificationIntent(this, event.id)
val pendingIntent = getNotificationIntent(this, event)
val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
if (isKitkatPlus())
@ -101,13 +101,15 @@ fun Context.scheduleEventIn(notifTS: Long, event: Event) {
}
fun Context.cancelNotification(id: Int) {
getNotificationIntent(this, id).cancel()
val intent = Intent(this, NotificationReceiver::class.java)
PendingIntent.getBroadcast(this, id, intent, PendingIntent.FLAG_UPDATE_CURRENT).cancel()
}
private fun getNotificationIntent(context: Context, eventId: Int): PendingIntent {
private fun getNotificationIntent(context: Context, event: Event): PendingIntent {
val intent = Intent(context, NotificationReceiver::class.java)
intent.putExtra(EVENT_ID, eventId)
return PendingIntent.getBroadcast(context, eventId, intent, PendingIntent.FLAG_UPDATE_CURRENT)
intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
intent.putExtra(EVENT_ID, event.id)
return PendingIntent.getBroadcast(context, event.id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
}
fun Context.getAppropriateTheme() = if (config.backgroundColor.getContrastColor() == Color.WHITE) R.style.MyDialogTheme_Dark else R.style.MyDialogTheme
@ -201,12 +203,14 @@ private fun getFormattedEventTime(startTime: String, endTime: String) = if (star
private fun getPendingIntent(context: Context, event: Event): PendingIntent {
val intent = Intent(context, EventActivity::class.java)
intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
intent.putExtra(EVENT_ID, event.id)
return PendingIntent.getActivity(context, event.id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
}
private fun getSnoozePendingIntent(context: Context, event: Event): PendingIntent {
val intent = Intent(context, SnoozeService::class.java).setAction("snooze")
intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
intent.putExtra(EVENT_ID, event.id)
return PendingIntent.getService(context, event.id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
}