Fix caching logic

duckduckgo · Apr 10, 2024 · f426d21 · f426d21
1 parent cb4dc82
commit f426d21
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/history/HistoryRepository.kt b/app/src/main/java/com/duckduckgo/app/history/HistoryRepository.kt
@@ -22,6 +22,7 @@ import io.reactivex.Single
 
 interface HistoryRepository {
     fun getHistoryObservable(): Single<List<HistoryEntry>>
+
     fun saveToHistory(
         url: String,
         title: String?,
@@ -38,11 +39,7 @@ class RealHistoryRepository(
     private var cachedHistoryEntries: List<HistoryEntry>? = null
 
     override fun getHistoryObservable(): Single<List<HistoryEntry>> {
-        return if (cachedHistoryEntries != null) {
-            Single.just(cachedHistoryEntries)
-        } else {
-            fetchAndCacheHistoryEntries()
-        }
+        return Single.just(cachedHistoryEntries ?: fetchAndCacheHistoryEntries())
     }
 
     override fun saveToHistory(
@@ -51,15 +48,20 @@ class RealHistoryRepository(
         query: String?,
         isSerp: Boolean,
     ) {
-        historyDao.updateOrInsertVisit(url, title ?: "", query, isSerp, currentTimeProvider.currentTimeMillis())
+        historyDao.updateOrInsertVisit(
+            url,
+            title ?: "",
+            query,
+            isSerp,
+            currentTimeProvider.currentTimeMillis(),
+        )
         fetchAndCacheHistoryEntries()
     }
-    private fun fetchAndCacheHistoryEntries(): Single<List<HistoryEntry>> {
-        return historyDao.getHistoryEntriesWithVisits()
-            .map { entries ->
-                entries.mapNotNull { it.toHistoryEntry() }.also {
-                    cachedHistoryEntries = it
-                }
-            }
+
+    private fun fetchAndCacheHistoryEntries(): List<HistoryEntry> {
+        return historyDao
+            .getHistoryEntriesWithVisits()
+            .mapNotNull { it.toHistoryEntry() }
+            .also { cachedHistoryEntries = it }
     }
 }
diff --git a/app/src/main/java/com/duckduckgo/app/history/store/HistoryDao.kt b/app/src/main/java/com/duckduckgo/app/history/store/HistoryDao.kt
@@ -21,13 +21,12 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
-import io.reactivex.Single
 
 @Dao
 interface HistoryDao {
     @Transaction
     @Query("SELECT * FROM history_entries")
-    fun getHistoryEntriesWithVisits(): Single<List<HistoryEntryWithVisits>>
+    fun getHistoryEntriesWithVisits(): List<HistoryEntryWithVisits>
 
     @Transaction
     fun updateOrInsertVisit(url: String, title: String, query: String?, isSerp: Boolean, date: Long) {