From 69e8a2f3576ead9721c78d59c0e9f6afe81ac74e Mon Sep 17 00:00:00 2001 From: ValentinTimisica Date: Wed, 25 Mar 2020 16:38:42 +0200 Subject: [PATCH] Fixes #4987: Remove close tabs functionality when they are added to a collection --- .../collections/CollectionCreationController.kt | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationController.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationController.kt index c07ef117d..d14cbf31f 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationController.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationController.kt @@ -13,7 +13,6 @@ import kotlinx.coroutines.launch import mozilla.components.browser.session.SessionManager import mozilla.components.feature.tab.collections.TabCollection import mozilla.components.feature.tabs.TabsUseCases -import org.mozilla.fenix.R import org.mozilla.fenix.components.Analytics import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.metrics.Event @@ -86,8 +85,6 @@ class DefaultCollectionCreationController( analytics.metrics.track( Event.CollectionSaved(normalSessionSize(sessionManager), sessionBundle.size) ) - - closeTabsIfNecessary(tabs, sessionManager, tabsUseCases) } override fun renameCollection(collection: TabCollection, name: String) { @@ -125,8 +122,6 @@ class DefaultCollectionCreationController( analytics.metrics.track( Event.CollectionTabsAdded(normalSessionSize(sessionManager), sessionBundle.size) ) - - closeTabsIfNecessary(tabs, sessionManager, tabsUseCases) } override fun saveTabsToCollection(tabs: List) { @@ -220,12 +215,4 @@ class DefaultCollectionCreationController( (!session.isCustomTabSession() && !session.private) }.size } - - private fun closeTabsIfNecessary(tabs: List, sessionManager: SessionManager, tabsUseCases: TabsUseCases) { - // Only close the tabs if the user is not on the BrowserFragment - if (store.state.previousFragmentId == R.id.browserFragment) { return } - tabs.asSequence() - .mapNotNull { tab -> sessionManager.findSessionById(tab.sessionId) } - .forEach { session -> tabsUseCases.removeTab(session) } - } }