Skip to content

Commit 0dcbc5c

Browse files
authored
Fix: nav history not cleared when favorite clicked (#1285)
* Fix: nav history not cleared when favorite clicked * remove unused command
1 parent ff978df commit 0dcbc5c

File tree

3 files changed

+1
-18
lines changed

3 files changed

+1
-18
lines changed

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -570,17 +570,6 @@ class BrowserTabViewModelTest {
570570
verify(mockFavoritesRepository, times(0)).insert(any(), any())
571571
}
572572

573-
@Test
574-
fun whenQuickAccessItemClickedThenSubmitNewQuery() {
575-
val savedSite = Favorite(1, "title", "http://example.com", 0)
576-
577-
testee.onQuickAccesItemClicked(savedSite)
578-
579-
assertCommandIssued<Command.SubmitQuery> {
580-
assertEquals("http://example.com", this.url)
581-
}
582-
}
583-
584573
@Test
585574
fun whenQuickAccessDeletedThenRepositoryUpdated() = coroutineRule.runBlocking {
586575
val savedSite = Favorite(1, "title", "http://example.com", 0)

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,6 @@ class BrowserTabFragment :
656656
is Command.ConvertBlobToDataUri -> convertBlobToDataUri(it)
657657
is Command.RequestFileDownload -> requestFileDownload(it.url, it.contentDisposition, it.mimeType, it.requestUserConfirmation)
658658
is Command.ChildTabClosed -> processUriForThirdPartyCookies()
659-
is Command.SubmitQuery -> submitQuery(it.url)
660659
is Command.CopyAliasToClipboard -> copyAliasToClipboard(it.alias)
661660
is Command.InjectEmailAddress -> injectEmailAddress(it.address)
662661
is Command.ShowEmailTooltip -> showEmailTooltip(it.address)
@@ -1033,7 +1032,7 @@ class BrowserTabFragment :
10331032
private fun createQuickAccessAdapter(onMoveListener: (RecyclerView.ViewHolder) -> Unit): FavoritesQuickAccessAdapter {
10341033
return FavoritesQuickAccessAdapter(
10351034
this, faviconManager, onMoveListener,
1036-
{ viewModel.onQuickAccesItemClicked(it.favorite) },
1035+
{ viewModel.onUserSubmittedQuery(it.favorite.url) },
10371036
{ viewModel.onEditSavedSiteRequested(it.favorite) },
10381037
{ viewModel.onDeleteQuickAccessItemRequested(it.favorite) }
10391038
)

app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ class BrowserTabViewModel(
277277
class AskToFireproofWebsite(val fireproofWebsite: FireproofWebsiteEntity) : Command()
278278
class ShareLink(val url: String) : Command()
279279
class CopyLink(val url: String) : Command()
280-
class SubmitQuery(val url: String) : Command()
281280
class FindInPageCommand(val searchTerm: String) : Command()
282281
class BrokenSiteFeedback(val data: BrokenSiteData) : Command()
283282
object DismissFindInPage : Command()
@@ -1945,10 +1944,6 @@ class BrowserTabViewModel(
19451944
}
19461945
}
19471946

1948-
fun onQuickAccesItemClicked(it: SavedSite) {
1949-
command.value = SubmitQuery(it.url)
1950-
}
1951-
19521947
fun deleteQuickAccessItem(savedSite: SavedSite) {
19531948
val favorite = savedSite as? SavedSite.Favorite ?: return
19541949
viewModelScope.launch(dispatchers.io() + NonCancellable) {

0 commit comments

Comments
 (0)