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

use simpler reminder scheduling by timestamp, not elapsed realtime

Browse Source
This commit is contained in:
tibbi
2017-05-14 22:27:50 +02:00
parent 34f83f74bf
commit d969224bbc
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,6 @@ import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.SystemClock
import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.activities.EventActivity import com.simplemobiletools.calendar.activities.EventActivity
import com.simplemobiletools.calendar.helpers.* import com.simplemobiletools.calendar.helpers.*
@@ -86,7 +85,7 @@ fun Context.scheduleNextEventReminder(event: Event) {
} }
if (event.repeatLimit == 0 || event.repeatLimit > nextTS || event.repeatLimit < 0) { if (event.repeatLimit == 0 || event.repeatLimit > nextTS || event.repeatLimit < 0) {
scheduleEventIn(nextTS, event) scheduleEventIn(nextTS * 1000L, event)
} }
} }
@@ -114,19 +113,17 @@ fun Context.scheduleReminder(event: Event) {
scheduleNextEventReminder(event) scheduleNextEventReminder(event)
} }
fun Context.scheduleEventIn(notifTS: Int, event: Event) { fun Context.scheduleEventIn(notifTS: Long, event: Event) {
val delayFromNow = notifTS.toLong() * 1000 - System.currentTimeMillis() if (notifTS < System.currentTimeMillis())
if (delayFromNow <= 0)
return return
val notifInMs = SystemClock.elapsedRealtime() + delayFromNow
val pendingIntent = getNotificationIntent(this, event.id) val pendingIntent = getNotificationIntent(this, event.id)
val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
if (isKitkatPlus()) if (isKitkatPlus())
alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, notifInMs, pendingIntent) alarmManager.setExact(AlarmManager.RTC_WAKEUP, notifTS, pendingIntent)
else else
alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, notifInMs, pendingIntent) alarmManager.set(AlarmManager.RTC_WAKEUP, notifTS, pendingIntent)
} }
fun Context.cancelNotification(id: Int) { fun Context.cancelNotification(id: Int) {