search

mozilla-mobile / android-components

⚠️ This project moved to a new repository. It is now developed and maintained at: https://github.com/mozilla-mobile/firefox-android
https://github.com/mozilla-mobile/firefox-android
Mozilla Public License 2.0
2.02k stars 473 forks source link

Bug 1795949 - Dismiss ChoiceDialogFragment only when it is attached. (backport #12973) #13019

Closed mergify[bot] closed 2 years ago

mergify[bot] commented 2 years ago

This is an automatic backport of pull request #12973 done by Mergify. Cherry-pick of 5a7ac900dd16c2a8905743ca141e8ab3e58ed80b has failed:

On branch mergify/bp/releases/107.0/pr-12973
Your branch is up to date with 'origin/releases/107.0'.

You are currently cherry-picking commit 5a7ac900dd.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
    modified:   components/feature/prompts/src/test/java/mozilla/components/feature/prompts/PromptFeatureTest.kt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   components/feature/prompts/src/main/java/mozilla/components/feature/prompts/PromptFeature.kt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com