Commit 9adc6177 authored by Emily Kager's avatar Emily Kager Committed by Emily Kager
Browse files

For #8358 - Make sure we don't cancel toolbar editing more than once

parent 9eb5fb5a
...@@ -80,6 +80,7 @@ class ToolbarView( ...@@ -80,6 +80,7 @@ class ToolbarView(
.findViewById(R.id.toolbar) .findViewById(R.id.toolbar)
private var isInitialized = false private var isInitialized = false
private var hasBeenCanceled = false
init { init {
view.apply { view.apply {
...@@ -120,7 +121,10 @@ class ToolbarView( ...@@ -120,7 +121,10 @@ class ToolbarView(
setOnEditListener(object : mozilla.components.concept.toolbar.Toolbar.OnEditListener { setOnEditListener(object : mozilla.components.concept.toolbar.Toolbar.OnEditListener {
override fun onCancelEditing(): Boolean { override fun onCancelEditing(): Boolean {
interactor.onEditingCanceled() // For some reason, this can be triggered twice on one back press. This only leads to
// navigateUp, so let's make sure we only call it once
if (!hasBeenCanceled) interactor.onEditingCanceled()
hasBeenCanceled = true
// We need to return false to not show display mode // We need to return false to not show display mode
return false return false
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment