From c87085a22659657ceed3cae55dd5e67249b0d892 Mon Sep 17 00:00:00 2001 From: Michael <5672750+mibac138@users.noreply.github.com> Date: Sat, 11 Dec 2021 17:35:55 +0100 Subject: [PATCH] Fix invalid order of school announcements (#1689) --- .../io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt | 2 +- .../modules/schoolannouncement/SchoolAnnouncementPresenter.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt index 56806604..15655f4a 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt @@ -10,6 +10,6 @@ import javax.inject.Singleton @Singleton interface SchoolAnnouncementDao : BaseDao { - @Query("SELECT * FROM SchoolAnnouncements WHERE student_id = :studentId") + @Query("SELECT * FROM SchoolAnnouncements WHERE student_id = :studentId ORDER BY date DESC") fun loadAll(studentId: Int): Flow> } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementPresenter.kt index d6a32e3c..62c93198 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementPresenter.kt @@ -74,7 +74,7 @@ class SchoolAnnouncementPresenter @Inject constructor( Status.SUCCESS -> { Timber.i("Loading School announcement result: Success") view?.apply { - updateData(it.data!!.sortedByDescending { item -> item.date }) + updateData(it.data!!) showEmpty(it.data.isEmpty()) showErrorView(false) showContent(it.data.isNotEmpty())