From 0ef2a09e8a1bfc3eda5152255478a8c302c63634 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Sun, 4 Oct 2020 14:06:03 +0100 Subject: [PATCH] Restored entries selection restoration =) --- .../main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt | 4 ++++ .../main/java/com/rtbishop/look4sat/repo/local/EntriesDao.kt | 3 +++ 2 files changed, 7 insertions(+) diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt b/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt index e78a334e..fb23d58d 100644 --- a/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt +++ b/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt @@ -62,7 +62,9 @@ class DefaultRepository @Inject constructor( withContext(Dispatchers.IO) { resolver.openInputStream(fileUri)?.use { stream -> val importedEntries = TLE.importSat(stream).map { SatEntry(it) } + val selection = entriesDao.getEntriesSelection() entriesDao.updateEntries(importedEntries) + entriesDao.updateEntriesSelection(selection) } } } @@ -80,7 +82,9 @@ class DefaultRepository @Inject constructor( val entries = TLE.importSat(stream).map { tle -> SatEntry(tle) } importedEntries.addAll(entries) } + val selection = entriesDao.getEntriesSelection() entriesDao.updateEntries(importedEntries) + entriesDao.updateEntriesSelection(selection) } } diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/local/EntriesDao.kt b/app/src/main/java/com/rtbishop/look4sat/repo/local/EntriesDao.kt index 53bb3180..885d3d98 100644 --- a/app/src/main/java/com/rtbishop/look4sat/repo/local/EntriesDao.kt +++ b/app/src/main/java/com/rtbishop/look4sat/repo/local/EntriesDao.kt @@ -41,6 +41,9 @@ interface EntriesDao { @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertEntries(entries: List) + @Query("SELECT catNum FROM entries WHERE isSelected = 1") + suspend fun getEntriesSelection(): List + @Transaction suspend fun updateEntriesSelection(satIds: List) { clearSelection()