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

notify running repeatable events on device boot too

This commit is contained in:
tibbi 2017-04-02 21:50:08 +02:00
parent 4709322eae
commit 6db2db029c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
View File

@ -361,18 +361,19 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
fun getEventsInBackground(fromTS: Int, toTS: Int, callback: GetEventsListener?) { fun getEventsInBackground(fromTS: Int, toTS: Int, callback: GetEventsListener?) {
val events = ArrayList<Event>() val events = ArrayList<Event>()
events.addAll(getEventsFor(fromTS, toTS))
val selection = "$COL_START_TS <= ? AND $COL_END_TS >= ? AND $COL_REPEAT_INTERVAL IS NULL" val selection = "$COL_START_TS <= ? AND $COL_END_TS >= ? AND $COL_REPEAT_INTERVAL IS NULL"
val selectionArgs = arrayOf(toTS.toString(), fromTS.toString()) val selectionArgs = arrayOf(toTS.toString(), fromTS.toString())
val cursor = getEventsCursor(selection, selectionArgs) val cursor = getEventsCursor(selection, selectionArgs)
events.addAll(fillEvents(cursor)) events.addAll(fillEvents(cursor))
events.addAll(getRepeatableEventsFor(fromTS, toTS))
val filtered = events.filterNot { it.ignoreEventOccurrences.contains(it.startTS) } as MutableList<Event> val filtered = events.filterNot { it.ignoreEventOccurrences.contains(it.startTS) } as MutableList<Event>
callback?.gotEvents(filtered) callback?.gotEvents(filtered)
} }
private fun getEventsFor(fromTS: Int, toTS: Int): List<Event> { private fun getRepeatableEventsFor(fromTS: Int, toTS: Int, getRunningEvents: Boolean = false): List<Event> {
val newEvents = ArrayList<Event>() val newEvents = ArrayList<Event>()
// get repeatable events // get repeatable events
@ -382,6 +383,8 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
while (e.startTS < toTS && (e.repeatLimit == 0 || e.repeatLimit > e.endTS)) { while (e.startTS < toTS && (e.repeatLimit == 0 || e.repeatLimit > e.endTS)) {
if (e.startTS >= fromTS) { if (e.startTS >= fromTS) {
newEvents.add(e.copy()) newEvents.add(e.copy())
} else if (getRunningEvents && (e.startTS <= fromTS && e.endTS >= toTS)) {
newEvents.add(e.copy())
} }
e.addIntervalTime() e.addIntervalTime()
} }
@ -391,11 +394,17 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
} }
fun getRunningEvents(callback: (events: ArrayList<Event>) -> Unit) { fun getRunningEvents(callback: (events: ArrayList<Event>) -> Unit) {
val events = ArrayList<Event>()
val ts = (System.currentTimeMillis() / 1000).toInt()
val selection = "$COL_START_TS <= ? AND $COL_END_TS >= ?" val selection = "$COL_START_TS <= ? AND $COL_END_TS >= ?"
val ts = (System.currentTimeMillis() / 1000).toString() val selectionArgs = arrayOf(ts.toString(), ts.toString())
val selectionArgs = arrayOf(ts, ts)
val cursor = getEventsCursor(selection, selectionArgs) val cursor = getEventsCursor(selection, selectionArgs)
callback(fillEvents(cursor) as ArrayList) events.addAll(fillEvents(cursor))
events.addAll(getRepeatableEventsFor(ts, ts, true))
callback(events)
} }
private fun getEvents(selection: String): List<Event> { private fun getEvents(selection: String): List<Event> {