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

Update DBHelper.kt

This commit is contained in:
Tibor Kaputa 2018-10-24 11:57:42 +02:00 committed by GitHub
parent a9f8b20341
commit 66987cb4c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -683,7 +683,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
fun getEvents(fromTS: Int, toTS: Int, eventId: Int = -1, callback: (events: ArrayList<Event>) -> Unit) { fun getEvents(fromTS: Int, toTS: Int, eventId: Int = -1, callback: (events: ArrayList<Event>) -> Unit) {
Thread { Thread {
getEventsInBackground(fromTS = fromTS, toTS = toTS, eventId = eventId, callback = callback) getEventsInBackground(fromTS, toTS, eventId, callback)
}.start() }.start()
} }
@ -705,16 +705,18 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
events.addAll(getAllDayEvents(fromTS, eventId)) events.addAll(getAllDayEvents(fromTS, eventId))
val displayEventTypes = context.config.displayEventTypes
if (filterEventType) { if (filterEventType) {
val displayEventTypes = context.config.displayEventTypes
events = events.filter { events = events.filter {
displayEventTypes.contains(it.toString()) displayEventTypes.contains(it.eventType.toString())
} as ArrayList<Event> } as ArrayList<Event>
} }
events = events events = events
.asSequence()
.distinct() .distinct()
.filterNot { it.ignoreEventOccurrences.contains(Formatter.getDayCodeFromTS(it.startTS).toInt()) } as ArrayList<Event> .filterNot { it.ignoreEventOccurrences.contains(Formatter.getDayCodeFromTS(it.startTS).toInt()) }
.toMutableList() as ArrayList<Event>
callback(events) callback(events)
} }