diff --git a/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDao.kt b/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDao.kt index 5de036d6..146c761e 100644 --- a/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDao.kt +++ b/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDao.kt @@ -33,7 +33,7 @@ interface SatelliteDao { @Query("SELECT catNum, name, isSelected FROM entries ORDER BY name ASC") fun getAllSatItems(): Flow> - @Query("SELECT * FROM transmitters WHERE isAlive = 1 and catNum = :catNum") + @Query("SELECT * FROM transmitters WHERE catNum = :catNum") fun getTransmittersByCatNum(catNum: Int): Flow> @Query("SELECT tle FROM entries WHERE isSelected = 1") @@ -47,6 +47,12 @@ interface SatelliteDao { @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertEntries(entries: List) + @Transaction + suspend fun updateTransmitters(transmitters: List) { + deleteTransmitters() + insertTransmitters(transmitters) + } + @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertTransmitters(transmitters: List) diff --git a/app/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt b/app/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt index 2be9c900..3f66d3ec 100644 --- a/app/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt +++ b/app/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt @@ -87,8 +87,8 @@ class SatelliteRepo @Inject constructor( } private suspend fun importTransmitters() { - val transmitters = satelliteService.fetchTransmitters() - satelliteDao.insertTransmitters(transmitters) + val transmitters = satelliteService.fetchTransmitters().filter { it.isAlive } + satelliteDao.updateTransmitters(transmitters) } private suspend fun getStreamsForSources(sources: List): List { diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c3510944..29ecccb4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -20,6 +20,8 @@ Пожалуйста, обновите спутники Ошибка обновления спутников + Выберите модуляцию трансивера + Нет предстоящих пролётов НПС - %.1f° @@ -79,5 +81,4 @@ к ним по лицензии Apache-2.0 Политика конфиденциальности \nЭто ПО поставляется без гарантий. \nПодробности в лицензии GNU GPLv3. - Выберите модуляцию трансивера diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index da599135..608144a0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,6 +23,8 @@ Please update TLE data Error importing satellite data + Choose transceiver mode + 00:00:00 - @@ -99,5 +101,4 @@ Privacy Policy \nThis app comes with no warranty. \nSee the GNU GPLv3 license for details. - Choose transmitter mode