Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Stopped clearing satellite entries on each TLE update #39
Arty Bishopbf1ce645538a
diff --git a/app/src/main/java/com/rtbishop/look4sat/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/SharedViewModel.ktindex b32f6d07..adac6f52 100644--- a/app/src/main/java/com/rtbishop/look4sat/SharedViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/SharedViewModel.kt@@ -26,7 +26,7 @@ import androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScopeimport com.rtbishop.look4sat.data.*import com.rtbishop.look4sat.repo.EntriesRepo-import com.rtbishop.look4sat.repo.DefaultSourcesRepo+import com.rtbishop.look4sat.repo.SourcesRepoimport com.rtbishop.look4sat.repo.TransmittersRepoimport com.rtbishop.look4sat.utility.PassPredictorimport com.rtbishop.look4sat.utility.PrefsManager@@ -40,7 +40,7 @@ import javax.inject.Inject@HiltViewModelclass SharedViewModel @Inject constructor(private val prefsManager: PrefsManager,- private val sourcesRepo: DefaultSourcesRepo,+ private val sourcesRepo: SourcesRepo,private val entriesRepo: EntriesRepo,private val transmittersRepo: TransmittersRepo) : ViewModel() {diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/EntriesRepo.kt b/app/src/main/java/com/rtbishop/look4sat/repo/EntriesRepo.ktindex c47f2daf..382723af 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/EntriesRepo.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repo/EntriesRepo.kt@@ -49,7 +49,7 @@ class EntriesRepo @Inject constructor(resolver.openInputStream(fileUri)?.use { stream ->val importedEntries = TLE.importSat(stream).map { SatEntry(it) }val selection = entriesDao.getEntriesSelection()- entriesDao.updateEntries(importedEntries)+ entriesDao.insertEntries(importedEntries)entriesDao.updateEntriesSelection(selection)}}@@ -70,7 +70,7 @@ class EntriesRepo @Inject constructor(importedEntries.addAll(entries)}val selection = entriesDao.getEntriesSelection()- entriesDao.updateEntries(importedEntries)+ entriesDao.insertEntries(importedEntries)entriesDao.updateEntriesSelection(selection)}}diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/DefaultSourcesRepo.kt b/app/src/main/java/com/rtbishop/look4sat/repo/SourcesRepo.ktsimilarity index 94%rename from app/src/main/java/com/rtbishop/look4sat/repo/DefaultSourcesRepo.ktrename to app/src/main/java/com/rtbishop/look4sat/repo/SourcesRepo.ktindex 104248e1..0f31f382 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/DefaultSourcesRepo.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repo/SourcesRepo.kt@@ -24,7 +24,7 @@ import com.rtbishop.look4sat.data.TleSourceimport com.rtbishop.look4sat.repo.local.SourcesDaoimport javax.inject.Inject-class DefaultSourcesRepo @Inject constructor(private val sourcesDao: SourcesDao) {+class SourcesRepo @Inject constructor(private val sourcesDao: SourcesDao) {fun getSources(): LiveData<List<TleSource>> {return sourcesDao.getSources()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.ktindex 0480993a..fba16ccf 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@@ -29,15 +29,6 @@ interface EntriesDao {@Query("SELECT * FROM entries ORDER BY name ASC")fun getEntries(): LiveData<List<SatEntry>>- @Transaction- suspend fun updateEntries(entries: List<SatEntry>) {- clearEntries()- insertEntries(entries)- }-- @Query("DELETE FROM entries")- suspend fun clearEntries()-@Insert(onConflict = OnConflictStrategy.REPLACE)suspend fun insertEntries(entries: List<SatEntry>)