From 41ee8a4efb146e5071f3e85b15e67a95648be572 Mon Sep 17 00:00:00 2001
From: Chenxia Liu <liuche@mozilla.com>
Date: Mon, 28 Oct 2019 00:03:43 -0700
Subject: [PATCH] For #6294 - When only one tab is being saved to collection,
 add it to selected tabs.

---
 .../mozilla/fenix/collections/CollectionCreationFragment.kt    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt
index 06abd9006..891262782 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt
@@ -47,8 +47,7 @@ class CollectionCreationFragment : DialogFragment() {
         val sessionManager = requireComponents.core.sessionManager
         val publicSuffixList = requireComponents.publicSuffixList
         val tabs = sessionManager.getTabs(args.tabIds, publicSuffixList)
-        val selectedTabs = sessionManager.getTabs(args.selectedTabIds, publicSuffixList)
-            .toSet()
+        val selectedTabs = if (tabs.size == 1) setOf(tabs.first()) else emptySet()
         val tabCollections = requireComponents.core.tabCollectionStorage.cachedTabCollections
         val selectedTabCollection = args.selectedTabCollectionId
             .let { id -> tabCollections.firstOrNull { it.id == id } }