fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not schedule notifications for deleted events

This commit is contained in:
tibbi 2017-03-05 21:15:43 +01:00
parent 27436f2e91
commit a647a52c31
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,11 +51,10 @@ fun Context.scheduleNextEventReminder(event: Event) {
val now = System.currentTimeMillis() / 1000 + 3 val now = System.currentTimeMillis() / 1000 + 3
var nextTS = Int.MAX_VALUE var nextTS = Int.MAX_VALUE
val reminderSeconds = event.getReminders().reversed().map { it * 60 } val reminderSeconds = event.getReminders().reversed().map { it * 60 }
reminderSeconds.forEach { reminderSeconds.forEach {
var startTS = event.startTS - it var startTS = event.startTS - it
if (event.repeatInterval == DAY || event.repeatInterval == WEEK || event.repeatInterval == BIWEEK) { if (event.repeatInterval == DAY || event.repeatInterval == WEEK || event.repeatInterval == BIWEEK) {
while (startTS < now) { while (startTS < now || event.ignoreEventOccurrences.contains(startTS)) {
startTS += event.repeatInterval startTS += event.repeatInterval
} }
nextTS = Math.min(nextTS, startTS) nextTS = Math.min(nextTS, startTS)
@ -108,9 +107,7 @@ private fun getNotificationIntent(context: Context, eventId: Int): PendingIntent
return PendingIntent.getBroadcast(context, eventId, intent, PendingIntent.FLAG_UPDATE_CURRENT) return PendingIntent.getBroadcast(context, eventId, intent, PendingIntent.FLAG_UPDATE_CURRENT)
} }
fun Context.getAppropriateTheme(): Int { fun Context.getAppropriateTheme() = if (config.backgroundColor.getContrastColor() == Color.WHITE) R.style.MyDialogTheme_Dark else R.style.MyDialogTheme
return if (config.backgroundColor.getContrastColor() == Color.WHITE) R.style.MyDialogTheme_Dark else R.style.MyDialogTheme
}
fun Context.getReminderText(minutes: Int) = when (minutes) { fun Context.getReminderText(minutes: Int) = when (minutes) {
-1 -> getString(R.string.no_reminder) -1 -> getString(R.string.no_reminder)
@ -149,8 +146,7 @@ fun Context.getRepetitionText(seconds: Int): String {
fun Context.getFilteredEvents(events: List<Event>): List<Event> { fun Context.getFilteredEvents(events: List<Event>): List<Event> {
val displayEventTypes = config.displayEventTypes val displayEventTypes = config.displayEventTypes
val filtered = events.filter { displayEventTypes.contains(it.eventType.toString()) } return events.filter { displayEventTypes.contains(it.eventType.toString()) }
return filtered
} }
fun Context.launchNewEventIntent(startNewTask: Boolean = false, today: Boolean = false) { fun Context.launchNewEventIntent(startNewTask: Boolean = false, today: Boolean = false) {