Filter empty searches

duckduckgo · Apr 9, 2024 · a413c59 · a413c59
1 parent fcb236d
commit a413c59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/history/HistoryEntry.kt b/app/src/main/java/com/duckduckgo/app/history/HistoryEntry.kt
@@ -44,9 +44,11 @@ sealed class HistoryEntry(
     ) : HistoryEntry(url = url, title, visits = visits)
 }
 
-fun HistoryEntryWithVisits.toHistoryEntry(): HistoryEntry {
-    return when (historyEntry.isSerp) {
-        true -> VisitedSERP(historyEntry.url.toUri(), historyEntry.title, historyEntry.query ?: "", visits = visits.map { Date(it.date) })
-        false -> VisitedPage(historyEntry.url.toUri(), historyEntry.title, visits.map { Date(it.date) })
+fun HistoryEntryWithVisits.toHistoryEntry(): HistoryEntry? {
+    if (historyEntry.url.isBlank()) return null
+    return if (historyEntry.isSerp && !historyEntry.query.isNullOrBlank()) {
+        VisitedSERP(historyEntry.url.toUri(), historyEntry.title, historyEntry.query, visits = visits.map { Date(it.date) })
+    } else {
+        VisitedPage(historyEntry.url.toUri(), historyEntry.title, visits.map { Date(it.date) })
     }
 }
diff --git a/app/src/main/java/com/duckduckgo/app/history/HistoryRepository.kt b/app/src/main/java/com/duckduckgo/app/history/HistoryRepository.kt
@@ -57,7 +57,7 @@ class RealHistoryRepository(
     private fun fetchAndCacheHistoryEntries(): Single<List<HistoryEntry>> {
         return historyDao.getHistoryEntriesWithVisits()
             .map { entries ->
-                entries.map { it.toHistoryEntry() }.also {
+                entries.mapNotNull { it.toHistoryEntry() }.also {
                     cachedHistoryEntries = it
                 }
             }