Skip to content

Handling target=_blank if link points to a file #798

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

Closed
wants to merge 3 commits into from
Closed

Handling target=_blank if link points to a file #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c74674
Handled target=_blank if link points to a file
AndrewR8 Apr 27, 2020
0ce0f1f
Deleted dismissDownloadFragment()
AndrewR8 Apr 27, 2020
9d3a41b
Added dismiss DownloadConfirmationFragment when onPause
AndrewR8 Apr 27, 2020
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
14 changes: 8 additions & 6 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 @@ -353,15 +353,9 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi

override fun onPause() {
logoHidingListener.onPause()
dismissDownloadFragment()
super.onPause()
}

private fun dismissDownloadFragment() {
val fragment = fragmentManager?.findFragmentByTag(DOWNLOAD_CONFIRMATION_TAG) as? DownloadConfirmationFragment
fragment?.dismiss()
}

private fun createPopupMenu() {
popupMenu = BrowserPopupMenu(layoutInflater)
val view = popupMenu.contentView
Expand Down Expand Up @@ -841,6 +835,14 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi
}

it.setDownloadListener { url, _, contentDisposition, mimeType, _ ->
//handling target=_blank if link points to a file
if (viewModel.url == null) { //in an empty tab
launch {
viewModel.closeCurrentTab()
destroyWebView()
}
}

requestFileDownload(url, contentDisposition, mimeType, true)
}

Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ class DownloadConfirmationFragment : BottomSheetDialogFragment() {
return view
}

override fun onPause() {
dismiss()
super.onPause()
}

private fun setupDownload() {
file = if (!pendingDownload.isDataUrl) File(pendingDownload.directory, pendingDownload.guessFileName()) else null
}
Expand Down