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

always schedule just the next reminder

This commit is contained in:
tibbi 2017-02-06 22:20:05 +01:00
parent b8c2103431
commit 23d802be10
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,21 +45,29 @@ fun Context.scheduleNextEventReminder(event: Event) {
if (event.getReminders().isEmpty())
return
var startTS = event.startTS - event.reminder1Minutes * 60
var newTS = startTS
if (event.repeatInterval == DAY || event.repeatInterval == WEEK || event.repeatInterval == BIWEEK) {
while (startTS < System.currentTimeMillis() / 1000 + 5) {
startTS += event.repeatInterval
var nextTS = Int.MAX_VALUE
val reminderSeconds = event.getReminders().reversed().map { it * 60 }
reminderSeconds.forEach {
var startTS = event.startTS - it
val now = System.currentTimeMillis() / 1000 + 5
if (event.repeatInterval == DAY || event.repeatInterval == WEEK || event.repeatInterval == BIWEEK) {
while (startTS < now) {
startTS += event.repeatInterval
}
nextTS = Math.min(nextTS, startTS)
} else if (event.repeatInterval == MONTH) {
nextTS = Math.min(nextTS, getNewTS(startTS, true))
} else if (event.repeatInterval == YEAR) {
nextTS = Math.min(nextTS, getNewTS(startTS, false))
}
newTS = startTS
} else if (event.repeatInterval == MONTH) {
newTS = getNewTS(startTS, true)
} else if (event.repeatInterval == YEAR) {
newTS = getNewTS(startTS, false)
}
if (newTS != 0 && (event.repeatLimit == 0 || event.repeatLimit > newTS))
scheduleEventIn(newTS, event)
if (nextTS == 0)
return
if (event.repeatLimit == 0 || event.repeatLimit > nextTS)
scheduleEventIn(nextTS, event)
}
private fun getNewTS(ts: Int, isMonthly: Boolean): Int {
@ -71,10 +79,8 @@ private fun getNewTS(ts: Int, isMonthly: Boolean): Int {
}
fun Context.scheduleReminder(event: Event) {
if (event.getRemindersCount() == 0)
return
scheduleNextEventReminder(event)
if (event.getReminders().isNotEmpty())
scheduleNextEventReminder(event)
}
fun Context.scheduleEventIn(notifTS: Int, event: Event) {

2
app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt
View File

@ -26,7 +26,7 @@ class NotificationReceiver : BroadcastReceiver() {
return
val event = DBHelper(context).getEvent(id)
if (event == null || event.getRemindersCount() == 0)
if (event == null || event.getReminders().isEmpty())
return
val pendingIntent = getPendingIntent(context, event)