Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add history results to autocomplete suggestions #4414

Merged
merged 12 commits into from
Apr 30, 2024
Merged

Add history results to autocomplete suggestions #4414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4d49ed5
Extract history to a new module
CrisBarreiro Apr 10, 2024
d6ff449
Use LocalDateTime instead of Date in history entries
CrisBarreiro Apr 10, 2024
1825b3d
Fix HistoryDaoTest
CrisBarreiro Apr 11, 2024
2b66c89
Rename HistoryApi to NavigationHistory
CrisBarreiro Apr 11, 2024
17af83f
Update readme
CrisBarreiro Apr 25, 2024
654e60b
Improve threading
CrisBarreiro Apr 25, 2024
728e419
Add Foreign keys to VisitEntity
CrisBarreiro Apr 25, 2024
0945101
Add history results to autocomplete suggestions
CrisBarreiro Apr 9, 2024
e60c6fa
Fix issues with duplicates
CrisBarreiro Apr 10, 2024
1c41e69
Add tests for history items
CrisBarreiro Apr 12, 2024
27d7dc4
Sort all suggestions by score regardless of their type
CrisBarreiro Apr 29, 2024
e7b0759
Defer local results until remote ones are available (#4420)
CrisBarreiro Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ fladle {
}

dependencies {
implementation project(":history-impl")
implementation project(":history-api")
implementation project(":verified-installation-impl")
implementation project(":verified-installation-api")

Expand Down
8 changes: 6 additions & 2 deletions app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import com.duckduckgo.app.accessibility.data.AccessibilitySettingsDataStore
import com.duckduckgo.app.accessibility.data.AccessibilitySettingsSharedPreferences
import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteResult
import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteBookmarkSuggestion
import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteHistorySearchSuggestion
import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteHistoryRelatedSuggestion.AutoCompleteHistorySearchSuggestion
import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteSearchSuggestion
import com.duckduckgo.app.autocomplete.api.AutoCompleteApi
import com.duckduckgo.app.autocomplete.api.AutoCompleteService
Expand Down Expand Up @@ -162,6 +162,7 @@ import com.duckduckgo.downloads.api.FileDownloader
import com.duckduckgo.downloads.api.FileDownloader.PendingFileDownload
import com.duckduckgo.feature.toggles.api.FeatureToggle
import com.duckduckgo.feature.toggles.api.Toggle
import com.duckduckgo.history.api.NavigationHistory
import com.duckduckgo.privacy.config.api.*
import com.duckduckgo.privacy.config.impl.features.gpc.RealGpc
import com.duckduckgo.privacy.config.impl.features.gpc.RealGpc.Companion.GPC_HEADER
Expand Down Expand Up @@ -261,6 +262,9 @@ class BrowserTabViewModelTest {
@Mock
private lateinit var mockSavedSitesRepository: SavedSitesRepository

@Mock
private lateinit var mockNavigationHistory: NavigationHistory

@Mock
private lateinit var mockLongPressHandler: LongPressHandler

Expand Down Expand Up @@ -465,7 +469,7 @@ class BrowserTabViewModelTest {
fireproofWebsiteDao = db.fireproofWebsiteDao()
locationPermissionsDao = db.locationPermissionsDao()

mockAutoCompleteApi = AutoCompleteApi(mockAutoCompleteService, mockSavedSitesRepository)
mockAutoCompleteApi = AutoCompleteApi(mockAutoCompleteService, mockSavedSitesRepository, mockNavigationHistory)
val fireproofWebsiteRepositoryImpl = FireproofWebsiteRepositoryImpl(
fireproofWebsiteDao,
coroutineRule.testDispatcherProvider,
Expand Down
6 changes: 3 additions & 3 deletions app/src/androidTest/java/com/duckduckgo/app/browser/pageloadpixel/PageLoadedHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.duckduckgo.app.browser.pageloadpixel

import com.duckduckgo.app.history.SaveToHistory
import com.duckduckgo.app.pixels.remoteconfig.OptimizeTrackerEvaluationRCWrapper
import com.duckduckgo.autoconsent.api.Autoconsent
import com.duckduckgo.browser.api.WebViewVersionProvider
import com.duckduckgo.common.test.CoroutineTestRule
import com.duckduckgo.common.utils.device.DeviceInfo
import com.duckduckgo.history.api.NavigationHistory
import kotlinx.coroutines.test.TestScope
import org.junit.Assert
import org.junit.Before
Expand All @@ -29,7 +29,7 @@ class PageLoadedHandlerTest {
private val webViewVersionProvider: WebViewVersionProvider = mock()
private val pageLoadedPixelDao: PageLoadedPixelDao = mock()
private val autoconsent: Autoconsent = mock()
private val saveToHistory: SaveToHistory = mock()
private val navigationHistory: NavigationHistory = mock()

private val testee = RealPageLoadedHandler(
deviceInfo,
Expand All @@ -42,7 +42,7 @@ class PageLoadedHandlerTest {
override val enabled: Boolean
get() = true
},
saveToHistory,
navigationHistory,
)

@Before
Expand Down