lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Check calendar permission in CalendarRepositoryImpl::getUpcomingEvents

Browse Source
This commit is contained in:
MM20 2022-01-15 22:32:32 +01:00
parent ff0aafa41a
commit 8ce84cfe22
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
calendar/src/main/java/de/mm20/launcher2/calendar/CalendarRepository.kt
View File

@ -156,23 +156,30 @@ class CalendarRepositoryImpl(
} }
override fun getUpcomingEvents(): Flow<List<CalendarEvent>> = channelFlow { override fun getUpcomingEvents(): Flow<List<CalendarEvent>> = channelFlow {
dataStore.data.map { it.calendarWidget }.collectLatest { settings -> val hasPermission = permissionsManager.hasPermission(PermissionGroup.Calendar)
hiddenItems.collectLatest { hidden -> hasPermission.collectLatest {
val now = System.currentTimeMillis() if (it) {
val end = now + 14 * 24 * 60 * 60 * 1000L dataStore.data.map { it.calendarWidget }.collectLatest { settings ->
val events = withContext(Dispatchers.IO) { hiddenItems.collectLatest { hidden ->
queryCalendarEvents( val now = System.currentTimeMillis()
query = "", val end = now + 14 * 24 * 60 * 60 * 1000L
intervalStart = now, val events = withContext(Dispatchers.IO) {
intervalEnd = end, queryCalendarEvents(
limit = 700, query = "",
excludeAllDayEvents = settings.hideAlldayEvents, intervalStart = now,
excludeCalendars = settings.excludeCalendarsList intervalEnd = end,
).filter { limit = 700,
!hiddenItems.value.contains(it.key) excludeAllDayEvents = settings.hideAlldayEvents,
excludeCalendars = settings.excludeCalendarsList
).filter {
!hiddenItems.value.contains(it.key)
}
}
send(events)
} }
} }
send(events) } else {
send(emptyList())
} }
} }
} }