dm1sh/another-widget
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix #136, fix #142

Browse Source
This commit is contained in:
Tommaso Berlose
2020-05-21 13:30:15 +02:00
parent ec1c25cb4c
commit 770040ad93
15 changed files with 379 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt
View File

@ -1,6 +1,7 @@
package com.tommasoberlose.anotherwidget.db
import android.content.Context
import android.provider.CalendarContract
import android.util.Log
import com.chibatching.kotpref.bulk
import com.tommasoberlose.anotherwidget.global.Preferences
@ -122,13 +123,18 @@ class EventRepository(val context: Context) {
MainWidget.updateWidget(context)
}
fun getFutureEvents(): RealmResults<Event> {
fun getFutureEvents(): List<Event> {
val now = Calendar.getInstance().timeInMillis
realm.refresh()
return realm.where(Event::class.java).greaterThan("endDate", now).findAll()
return realm
.where(Event::class.java)
.greaterThan("endDate", now)
.findAll()
.filter { (Preferences.showDeclinedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) }
.filter { (Preferences.calendarAllDay || !it.allDay) }
}
private fun getEvents(): RealmResults<Event> {
private fun getEvents(): List<Event> {
val now = Calendar.getInstance().timeInMillis
val limit = Calendar.getInstance().apply {
timeInMillis = now
@ -145,7 +151,13 @@ class EventRepository(val context: Context) {
}
}
realm.refresh()
return realm.where(Event::class.java).greaterThan("endDate", now).lessThanOrEqualTo("startDate", limit.timeInMillis).findAll()
return realm
.where(Event::class.java)
.greaterThan("endDate", now)
.lessThanOrEqualTo("startDate", limit.timeInMillis)
.findAll()
.filter { (Preferences.showDeclinedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) }
.filter { (Preferences.calendarAllDay || !it.allDay) }
}
fun getEventsCount(): Int = getEvents().size