From 37bae3bb38db2915bac23be11effa48423e2a51b Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Mon, 6 May 2019 14:38:53 -0700 Subject: [PATCH] For #2289 - Null out pending job on undo (#2303) --- .../main/java/org/mozilla/fenix/home/HomeFragment.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index 0aab62334..64de575c4 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -43,15 +43,15 @@ import org.mozilla.fenix.ext.allowUndo import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.share import org.mozilla.fenix.ext.urlToTrimmedHost +import org.mozilla.fenix.home.sessioncontrol.CollectionAction import org.mozilla.fenix.home.sessioncontrol.Mode import org.mozilla.fenix.home.sessioncontrol.SessionControlAction import org.mozilla.fenix.home.sessioncontrol.SessionControlChange import org.mozilla.fenix.home.sessioncontrol.SessionControlComponent import org.mozilla.fenix.home.sessioncontrol.SessionControlState -import org.mozilla.fenix.home.sessioncontrol.TabAction -import org.mozilla.fenix.home.sessioncontrol.CollectionAction -import org.mozilla.fenix.home.sessioncontrol.TabCollection import org.mozilla.fenix.home.sessioncontrol.Tab +import org.mozilla.fenix.home.sessioncontrol.TabAction +import org.mozilla.fenix.home.sessioncontrol.TabCollection import org.mozilla.fenix.lib.Do import org.mozilla.fenix.mvi.ActionBusFactory import org.mozilla.fenix.mvi.getAutoDisposeObservable @@ -388,7 +388,10 @@ class HomeFragment : Fragment(), CoroutineScope { CoroutineScope(Dispatchers.Main).allowUndo( view!!, getString(R.string.snackbar_tab_deleted), - getString(R.string.snackbar_deleted_undo), { emitSessionChanges() } + getString(R.string.snackbar_deleted_undo), { + deleteSessionJob = null + emitSessionChanges() + } ) { sessionManager.findSessionById(sessionId) ?.let { session ->