From 88d74642ae94093f94bc090bfc6b54e14e35c8fc Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Sat, 31 May 2025 12:09:57 -0500 Subject: [PATCH] refactor: FirmwareReleaseDao to return non-nullable lists (#1991) --- .../com/geeksville/mesh/database/dao/FirmwareReleaseDao.kt | 4 ++-- .../mesh/repository/api/FirmwareReleaseLocalDataSource.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/database/dao/FirmwareReleaseDao.kt b/app/src/main/java/com/geeksville/mesh/database/dao/FirmwareReleaseDao.kt index 6576607c7..07215f83b 100644 --- a/app/src/main/java/com/geeksville/mesh/database/dao/FirmwareReleaseDao.kt +++ b/app/src/main/java/com/geeksville/mesh/database/dao/FirmwareReleaseDao.kt @@ -33,8 +33,8 @@ interface FirmwareReleaseDao { suspend fun deleteAll() @Query("SELECT * FROM firmware_release") - suspend fun getAllReleases(): List? + suspend fun getAllReleases(): List @Query("SELECT * FROM firmware_release WHERE release_type = :releaseType") - suspend fun getReleasesByType(releaseType: FirmwareReleaseType): List? + suspend fun getReleasesByType(releaseType: FirmwareReleaseType): List } diff --git a/app/src/main/java/com/geeksville/mesh/repository/api/FirmwareReleaseLocalDataSource.kt b/app/src/main/java/com/geeksville/mesh/repository/api/FirmwareReleaseLocalDataSource.kt index fd723e69c..f5ddb6e93 100644 --- a/app/src/main/java/com/geeksville/mesh/repository/api/FirmwareReleaseLocalDataSource.kt +++ b/app/src/main/java/com/geeksville/mesh/repository/api/FirmwareReleaseLocalDataSource.kt @@ -52,7 +52,7 @@ class FirmwareReleaseLocalDataSource @Inject constructor( suspend fun getLatestRelease(releaseType: FirmwareReleaseType): FirmwareReleaseEntity? = withContext(Dispatchers.IO) { val releases = firmwareReleaseDao.getReleasesByType(releaseType) - if (releases.isNullOrEmpty()) { + if (releases.isEmpty()) { return@withContext null } else { val latestRelease =