Skip to content

Fix: nav history not cleared when favorite clicked #1285

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

Merged
merged 2 commits into from
Jun 21, 2021
Merged

Fix: nav history not cleared when favorite clicked #1285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1599d4
Fix: nav history not cleared when favorite clicked
cmonfortep Jun 17, 2021
13ceaa6
remove unused command
cmonfortep Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 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 @@ -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<Command.SubmitQuery> {
assertEquals("http://example.com", this.url)
}
}

@Test
fun whenQuickAccessDeletedThenRepositoryUpdated() = coroutineRule.runBlocking {
val savedSite = Favorite(1, "title", "http://example.com", 0)
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -1033,7 +1032,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) }
)
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -1945,10 +1944,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) {
Expand Down