Skip to content

Fix issue where url can sometimes be out-of-date on broken url form #298

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 28, 2018
Merged

Fix issue where url can sometimes be out-of-date on broken url form #298

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
d06f07f
Use site model url (rather than live url which is designed to trigger…
subsymbolic Jun 28, 2018
b618745
Update test names and assert, non-logic changes
subsymbolic Jun 28, 2018
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
15 changes: 15 additions & 0 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 @@ -663,6 +663,21 @@ class BrowserTabViewModelTest {
assertEquals("foo", command.url)
}

@Test
fun whenOnSiteAndBrokenSiteSelectedThenBrokenSiteFeedbackCommandSentWithUrl() {
testee.urlChanged("foo.com")
testee.onBrokenSiteSelected()
val command = captureCommands().value as Command.BrokenSiteFeedback
assertEquals("foo.com", command.url)
}

@Test
fun whenNoSiteAndBrokenSiteSelectedThenBrokenSiteFeedbackCommandSentWithoutUrl() {
testee.onBrokenSiteSelected()
val command = captureCommands().value as Command.BrokenSiteFeedback
assertNull(command.url)
}

@Test
fun whenUserSelectsToShareLinkWithNullUrlThenShareLinkCommandNotSent() {
testee.userSharingLink(null)
Expand Down
5 changes: 4 additions & 1 deletion 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 @@ -202,7 +202,7 @@ class BrowserTabFragment : Fragment(), FindListener {
onMenuItemClicked(view.bookmarksPopupMenuItem) { browserActivity?.launchBookmarks() }
onMenuItemClicked(view.addBookmarksPopupMenuItem) { addBookmark() }
onMenuItemClicked(view.findInPageMenuItem) { viewModel.userRequestingToFindInPage() }
onMenuItemClicked(view.brokenSitePopupMenuItem) { browserActivity?.launchBrokenSiteFeedback(viewModel.url.value) }
onMenuItemClicked(view.brokenSitePopupMenuItem) { viewModel.onBrokenSiteSelected() }
onMenuItemClicked(view.settingsPopupMenuItem) { browserActivity?.launchSettings() }
onMenuItemClicked(view.requestDesktopSiteCheckMenuItem) {
viewModel.desktopSiteModeToggled(
Expand Down Expand Up @@ -296,6 +296,9 @@ class BrowserTabFragment : Fragment(), FindListener {
Command.HideKeyboard -> {
hideKeyboard()
}
is Command.BrokenSiteFeedback -> {
browserActivity?.launchBrokenSiteFeedback(it.url)
}
is Command.ShowFullScreen -> {
webViewFullScreenContainer.addView(
it.view, ViewGroup.LayoutParams(
Expand Down
5 changes: 5 additions & 0 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 @@ -135,6 +135,7 @@ class BrowserTabViewModel(
class DownloadImage(val url: String) : Command()
class ShareLink(val url: String) : Command()
class FindInPageCommand(val searchTerm: String) : Command()
class BrokenSiteFeedback(val url: String?) : Command()
class DisplayMessage(@StringRes val messageId: Int) : Command()
object DismissFindInPage : Command()
class ShowFileChooser(val filePathCallback: ValueCallback<Array<Uri>>, val fileChooserParams: WebChromeClient.FileChooserParams) : Command()
Expand Down Expand Up @@ -431,6 +432,10 @@ class BrowserTabViewModel(
command.value = DisplayMessage(R.string.bookmarkAddedFeedback)
}

fun onBrokenSiteSelected() {
command.value = BrokenSiteFeedback(site?.url)
}

fun onUserSelectedToEditQuery(query: String) {
omnibarViewState.value = currentOmnibarViewState().copy(isEditing = false, omnibarText = query)
autoCompleteViewState.value = AutoCompleteViewState(showSuggestions = false)
Expand Down