sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[Notifications] Disable notifications about past events & timetable changes.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2020-02-12 23:05:03 +01:00
parent 3a500f3f28
commit bfbc0861df
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/Notifications.kt
View File

@ -37,7 +37,7 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
} }
private fun timetableNotifications() { private fun timetableNotifications() {
for (lesson in app.db.timetableDao().getNotNotifiedNow()) { for (lesson in app.db.timetableDao().getNotNotifiedNow().filter { it.displayDate == null || it.displayDate!! >= today }) {
val text = app.getString( val text = app.getString(
R.string.notification_lesson_change_format, R.string.notification_lesson_change_format,
lesson.getDisplayChangeType(app), lesson.getDisplayChangeType(app),
@ -58,7 +58,7 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
} }
private fun eventNotifications() { private fun eventNotifications() {
for (event in app.db.eventDao().notNotifiedNow) { for (event in app.db.eventDao().notNotifiedNow.filter { it.eventDate >= today }) {
val text = if (event.type == Event.TYPE_HOMEWORK) val text = if (event.type == Event.TYPE_HOMEWORK)
app.getString( app.getString(
if (event.subjectLongName.isNullOrEmpty()) if (event.subjectLongName.isNullOrEmpty())
@ -93,7 +93,7 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
} }
fun sharedEventNotifications() { fun sharedEventNotifications() {
for (event in app.db.eventDao().notNotifiedNow.filter { it.sharedBy != null }) { for (event in app.db.eventDao().notNotifiedNow.filter { it.eventDate >= today && it.sharedBy != null }) {
val text = app.getString( val text = app.getString(
R.string.notification_shared_event_format, R.string.notification_shared_event_format,
event.sharedByName, event.sharedByName,
@ -274,4 +274,4 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
) )
} }
} }
} }