From a1599d4bcaefae5eb42e431b995f0babd62eed90 Mon Sep 17 00:00:00 2001 From: Cristian Monforte Date: Thu, 17 Jun 2021 14:48:09 +0200 Subject: [PATCH 1/2] Fix: nav history not cleared when favorite clicked --- .../duckduckgo/app/browser/BrowserTabViewModelTest.kt | 11 ----------- .../com/duckduckgo/app/browser/BrowserTabFragment.kt | 2 +- .../com/duckduckgo/app/browser/BrowserTabViewModel.kt | 4 ---- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt index 8914b6e70fbd..1531f08d3762 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt @@ -570,17 +570,6 @@ class BrowserTabViewModelTest { verify(mockFavoritesRepository, times(0)).insert(any(), any()) } - @Test - fun whenQuickAccessItemClickedThenSubmitNewQuery() { - val savedSite = Favorite(1, "title", "http://example.com", 0) - - testee.onQuickAccesItemClicked(savedSite) - - assertCommandIssued { - assertEquals("http://example.com", this.url) - } - } - @Test fun whenQuickAccessDeletedThenRepositoryUpdated() = coroutineRule.runBlocking { val savedSite = Favorite(1, "title", "http://example.com", 0) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt index 82ababed5579..f4d8c1748703 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt @@ -1033,7 +1033,7 @@ class BrowserTabFragment : private fun createQuickAccessAdapter(onMoveListener: (RecyclerView.ViewHolder) -> Unit): FavoritesQuickAccessAdapter { return FavoritesQuickAccessAdapter( this, faviconManager, onMoveListener, - { viewModel.onQuickAccesItemClicked(it.favorite) }, + { viewModel.onUserSubmittedQuery(it.favorite.url) }, { viewModel.onEditSavedSiteRequested(it.favorite) }, { viewModel.onDeleteQuickAccessItemRequested(it.favorite) } ) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt index 248aeafdc459..cdac7d18938f 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt @@ -1945,10 +1945,6 @@ class BrowserTabViewModel( } } - fun onQuickAccesItemClicked(it: SavedSite) { - command.value = SubmitQuery(it.url) - } - fun deleteQuickAccessItem(savedSite: SavedSite) { val favorite = savedSite as? SavedSite.Favorite ?: return viewModelScope.launch(dispatchers.io() + NonCancellable) { From 13ceaa611a9168d580db212c6fabf98ca26c090e Mon Sep 17 00:00:00 2001 From: Cristian Monforte Date: Mon, 21 Jun 2021 13:54:48 +0200 Subject: [PATCH 2/2] remove unused command --- .../main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt | 1 - .../main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt | 1 - 2 files changed, 2 deletions(-) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt index f4d8c1748703..2df8c09d7abf 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt @@ -656,7 +656,6 @@ class BrowserTabFragment : is Command.ConvertBlobToDataUri -> convertBlobToDataUri(it) is Command.RequestFileDownload -> requestFileDownload(it.url, it.contentDisposition, it.mimeType, it.requestUserConfirmation) is Command.ChildTabClosed -> processUriForThirdPartyCookies() - is Command.SubmitQuery -> submitQuery(it.url) is Command.CopyAliasToClipboard -> copyAliasToClipboard(it.alias) is Command.InjectEmailAddress -> injectEmailAddress(it.address) is Command.ShowEmailTooltip -> showEmailTooltip(it.address) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt index cdac7d18938f..069448e4a095 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt @@ -277,7 +277,6 @@ class BrowserTabViewModel( class AskToFireproofWebsite(val fireproofWebsite: FireproofWebsiteEntity) : Command() class ShareLink(val url: String) : Command() class CopyLink(val url: String) : Command() - class SubmitQuery(val url: String) : Command() class FindInPageCommand(val searchTerm: String) : Command() class BrokenSiteFeedback(val data: BrokenSiteData) : Command() object DismissFindInPage : Command()