From bf1ce645538aaca48005371d747b96afcc5760dc Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Fri, 26 Feb 2021 18:36:08 +0000
Subject: [PATCH] Stopped clearing satellite entries on each TLE update #39

---
 .../main/java/com/rtbishop/look4sat/SharedViewModel.kt   | 4 ++--
 .../main/java/com/rtbishop/look4sat/repo/EntriesRepo.kt  | 4 ++--
 .../repo/{DefaultSourcesRepo.kt => SourcesRepo.kt}       | 2 +-
 .../java/com/rtbishop/look4sat/repo/local/EntriesDao.kt  | 9 ---------
 4 files changed, 5 insertions(+), 14 deletions(-)
 rename app/src/main/java/com/rtbishop/look4sat/repo/{DefaultSourcesRepo.kt => SourcesRepo.kt} (94%)

diff --git a/app/src/main/java/com/rtbishop/look4sat/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/SharedViewModel.kt
index 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.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.rtbishop.look4sat.data.*
 import com.rtbishop.look4sat.repo.EntriesRepo
-import com.rtbishop.look4sat.repo.DefaultSourcesRepo
+import com.rtbishop.look4sat.repo.SourcesRepo
 import com.rtbishop.look4sat.repo.TransmittersRepo
 import com.rtbishop.look4sat.utility.PassPredictor
 import com.rtbishop.look4sat.utility.PrefsManager
@@ -40,7 +40,7 @@ import javax.inject.Inject
 @HiltViewModel
 class 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.kt
index 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.kt
similarity index 94%
rename from app/src/main/java/com/rtbishop/look4sat/repo/DefaultSourcesRepo.kt
rename to app/src/main/java/com/rtbishop/look4sat/repo/SourcesRepo.kt
index 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.TleSource
 import com.rtbishop.look4sat.repo.local.SourcesDao
 import 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.kt
index 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>)