Skip to content

Force dismiss any showing dialog on tab change #5607

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

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Force dismiss any showing dialog on tab change #5607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 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 @@ -1320,6 +1320,7 @@ class BrowserTabFragment :

// want to ensure that we aren't offering to inject credentials from an inactive tab
hideDialogWithTag(CredentialAutofillPickerDialog.TAG)
sitePermissionsDialogLauncher.forceDismissDialog()
}
}
},
Expand Down
5 changes: 5 additions & 0 deletions ...ns-api/src/main/java/com/duckduckgo/site/permissions/api/SitePermissionsDialogLauncher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,9 @@ interface SitePermissionsDialogLauncher {
request: PermissionRequest,
permissionsGrantedListener: SitePermissionsGrantedListener,
)

/**
* This method could be called to force dismiss the site permission dialog that is currently showing, if any.
*/
fun forceDismissDialog()
}
34 changes: 22 additions & 12 deletions ...c/main/java/com/duckduckgo/site/permissions/impl/SitePermissionsDialogActivityLauncher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import com.duckduckgo.app.browser.favicon.FaviconManager
import com.duckduckgo.app.di.AppCoroutineScope
import com.duckduckgo.app.statistics.pixels.Pixel
import com.duckduckgo.common.ui.view.button.ButtonType.GHOST
import com.duckduckgo.common.ui.view.dialog.DaxAlertDialog
import com.duckduckgo.common.ui.view.dialog.TextAlertDialogBuilder
import com.duckduckgo.common.ui.view.toPx
import com.duckduckgo.common.utils.DispatcherProvider
Expand Down Expand Up @@ -73,6 +74,7 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
private lateinit var permissionsHandledAutomatically: List<String>
private var siteURL: String = ""
private var tabId: String = ""
private var currentDialog: DaxAlertDialog? = null

override fun registerPermissionLauncher(caller: ActivityResultCaller) {
systemPermissionsHelper.registerPermissionLaunchers(
Expand Down Expand Up @@ -165,7 +167,7 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
R.string.preciseLocationSiteDialogSubtitle
}

TextAlertDialogBuilder(activity)
this.currentDialog = TextAlertDialogBuilder(activity)
.setTitle(
String.format(activity.getString(R.string.sitePermissionsLocationDialogTitle), domain),
)
Expand Down Expand Up @@ -196,8 +198,16 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
rememberChoice = checked
}
},
)
.show()
).build()
this.currentDialog?.show()
}

override fun forceDismissDialog() {
this.currentDialog?.let {
if (it.isShowing()) {
this.currentDialog?.dismiss()
}
}
}

private fun showSitePermissionsRationaleDialog(
Expand All @@ -208,7 +218,7 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
onPermissionAllowed: (Boolean) -> Unit,
) {
sendDialogImpressionPixel(pixelType)
TextAlertDialogBuilder(activity)
this.currentDialog = TextAlertDialogBuilder(activity)
.setTitle(String.format(activity.getString(titleRes), url.websiteFromGeoLocationsApiOrigin()))
.setMessage(messageRes)
.setPositiveButton(R.string.sitePermissionsDialogAllowButton, GHOST)
Expand All @@ -233,8 +243,8 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
super.onCheckedChanged(checked)
}
},
)
.show()
).build()
this.currentDialog?.show()
}

private fun showSiteDrmPermissionsDialog(
Expand Down Expand Up @@ -263,7 +273,7 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(

// No session-based setting and no config --> proceed to show dialog
val title = url.websiteFromGeoLocationsApiOrigin()
TextAlertDialogBuilder(activity)
this.currentDialog = TextAlertDialogBuilder(activity)
.setTitle(
String.format(
activity.getString(R.string.drmSiteDialogTitle),
Expand Down Expand Up @@ -312,8 +322,8 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
rememberChoice = checked
}
},
)
.show()
).build()
this.currentDialog?.show()
}

private fun onSiteDrmPermissionSave(
Expand Down Expand Up @@ -588,7 +598,7 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
SitePermissionsRequestedType.CAMERA_AND_AUDIO -> R.string.systemPermissionDialogCameraAndAudioDeniedContent
SitePermissionsRequestedType.LOCATION -> R.string.systemPermissionDialogLocationDeniedContent
}
TextAlertDialogBuilder(activity)
this.currentDialog = TextAlertDialogBuilder(activity)
.setTitle(titleRes)
.setMessage(contentRes)
.setPositiveButton(R.string.systemPermissionsDeniedDialogPositiveButton)
Expand All @@ -603,8 +613,8 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
activity.startActivity(intent)
}
},
)
.show()
).build()
this.currentDialog?.show()
}

private fun storeFavicon(url: String) {
Expand Down
Loading