From 9adc61776574e2fea8a1274049b28b95e7792921 Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Wed, 12 Feb 2020 15:12:35 -0800 Subject: [PATCH] For #8358 - Make sure we don't cancel toolbar editing more than once --- .../java/org/mozilla/fenix/search/toolbar/ToolbarView.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt index cf0421190..b1ef25f92 100644 --- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt @@ -80,6 +80,7 @@ class ToolbarView( .findViewById(R.id.toolbar) private var isInitialized = false + private var hasBeenCanceled = false init { view.apply { @@ -120,7 +121,10 @@ class ToolbarView( setOnEditListener(object : mozilla.components.concept.toolbar.Toolbar.OnEditListener { 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 return false }