From 4954aadd84b8590ef6c23065a34c7d0c0ea23ebf Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Thu, 6 Jun 2019 12:24:25 -0700 Subject: [PATCH] For #3156 - If only one tab adding to collection make it selected (#3222) --- app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e1779e89a8..bb5bc21093 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -626,7 +626,7 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver { ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java) } viewModel?.tabs = tabs - val selectedTabs = tabs.find { tab -> tab.sessionId == selectedTabId } + val selectedTabs = tabs.find { tab -> tab.sessionId == selectedTabId } ?: if (tabs.size == 1) tabs[0] else null val selectedSet = if (selectedTabs == null) mutableSetOf() else mutableSetOf(selectedTabs) viewModel?.selectedTabs = selectedSet viewModel?.tabCollections = requireComponents.core.tabCollectionStorage.cachedTabCollections.reversed()