Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Now clearing satellite transceivers data on update
Arty Bishop040ad844f5f9
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.ktindex 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<List<SatItem>>- @Query("SELECT * FROM transmitters WHERE isAlive = 1 and catNum = :catNum")+ @Query("SELECT * FROM transmitters WHERE catNum = :catNum")fun getTransmittersByCatNum(catNum: Int): Flow<List<SatTrans>>@Query("SELECT tle FROM entries WHERE isSelected = 1")@@ -47,6 +47,12 @@ interface SatelliteDao {@Insert(onConflict = OnConflictStrategy.REPLACE)suspend fun insertEntries(entries: List<SatEntry>)+ @Transaction+ suspend fun updateTransmitters(transmitters: List<SatTrans>) {+ deleteTransmitters()+ insertTransmitters(transmitters)+ }+@Insert(onConflict = OnConflictStrategy.REPLACE)suspend fun insertTransmitters(transmitters: List<SatTrans>)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.ktindex 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<TleSource>): List<InputStream> {diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 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 @@<string name="entries_no_data">Пожалуйста, обновите спутники</string><string name="entries_update_error">Ошибка обновления спутников</string>+ <string name="modes_title">Выберите модуляцию трансивера</string>+<string name="passes_error">Нет предстоящих пролётов</string><string name="pass_aosAz">НПС - %.1f°</string>@@ -79,5 +81,4 @@к ним по лицензии <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></string><string name="info_warranty"><a href="https://sites.google.com/view/look4sat-privacy-policy/home">Политика конфиденциальности</a>\nЭто ПО поставляется без гарантий. \nПодробности в лицензии <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPLv3</a>.</string>- <string name="modes_title">Выберите модуляцию трансивера</string></resources>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex da599135..608144a0 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -23,6 +23,8 @@<string name="entries_no_data">Please update TLE data</string><string name="entries_update_error">Error importing satellite data</string>+ <string name="modes_title">Choose transceiver mode</string>+<string name="timer_zero" translatable="false">00:00:00</string><string name="timer_placeholder" translatable="false">-</string>@@ -99,5 +101,4 @@</string><string name="info_warranty"><a href="https://sites.google.com/view/look4sat-privacy-policy/home">Privacy Policy</a>\nThis app comes with no warranty. \nSee the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPLv3</a> license for details.</string>- <string name="modes_title">Choose transmitter mode</string></resources>