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 78341e47e..b14bd5b07 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -386,14 +386,14 @@ class HomeFragment : Fragment() { } is TabAction.Close -> { if (pendingSessionDeletion?.deletionJob == null) { - removeTabWithUndo(action.sessionId) + removeTabWithUndo(action.sessionId, browsingModeManager.mode.isPrivate) } else { pendingSessionDeletion?.deletionJob?.let { viewLifecycleOwner.lifecycleScope.launch { it.invoke() }.invokeOnCompletion { pendingSessionDeletion = null - removeTabWithUndo(action.sessionId) + removeTabWithUndo(action.sessionId, browsingModeManager.mode.isPrivate) } } } @@ -719,9 +719,9 @@ class HomeFragment : Fragment() { deleteAllSessionsJob = deleteOperation val snackbarMessage = if (private) { - getString(R.string.snackbar_private_tabs_deleted) + getString(R.string.snackbar_private_tabs_closed) } else { - getString(R.string.snackbar_tab_deleted) + getString(R.string.snackbar_tabs_closed) } viewLifecycleOwner.lifecycleScope.allowUndo( @@ -739,7 +739,7 @@ class HomeFragment : Fragment() { ) } - private fun removeTabWithUndo(sessionId: String) { + private fun removeTabWithUndo(sessionId: String, private: Boolean) { val sessionManager = requireComponents.core.sessionManager val deleteOperation: (suspend () -> Unit) = { sessionManager.findSessionById(sessionId) @@ -751,9 +751,15 @@ class HomeFragment : Fragment() { pendingSessionDeletion = PendingSessionDeletion(deleteOperation, sessionId) + val snackbarMessage = if (private) { + getString(R.string.snackbar_private_tab_closed) + } else { + getString(R.string.snackbar_tab_closed) + } + viewLifecycleOwner.lifecycleScope.allowUndo( view!!, - getString(R.string.snackbar_tab_deleted), + snackbarMessage, getString(R.string.snackbar_deleted_undo), { pendingSessionDeletion = null emitSessionChanges() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 326f4e0e3..a55315ba9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -637,6 +637,14 @@ Tab deleted Tabs deleted + + Tab closed + + Tabs closed + + Private tab closed + + Private tabs closed Private tabs deleted