From 30a643720f28d6a3d747b734bff55a0659886709 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Thu, 16 May 2019 14:07:19 -0700
Subject: [PATCH] For #1574: Adds tab collection creation

---
 .../org/mozilla/fenix/collections/CollectionCreationUIView.kt  | 3 +--
 app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt       | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
index 815dd2487..4c0c8f615 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
@@ -83,7 +83,6 @@ class CollectionCreationUIView(
                         v.text.toString()
                     )
                 )
-                true
             }
             false
         }
@@ -194,7 +193,7 @@ class CollectionCreationUIView(
                         1
                     )
                 )
-                name_collection_edittext.setSelection(name_collection_edittext.text.length)
+                name_collection_edittext.setSelection(0, name_collection_edittext.text.length)
                 back_button.text =
                     view.context.getString(R.string.create_collection_name_collection)
             }
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 9f9a11720..9eab3e10d 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -252,6 +252,7 @@ class HomeFragment : Fragment(), CoroutineScope {
     private fun handleTabAction(action: TabAction) {
         Do exhaustive when (action) {
             is TabAction.SaveTabGroup -> {
+                if ((activity as HomeActivity).browsingModeManager.isPrivate) { return }
                 showCollectionCreationFragment(action.selectedTabSessionId)
             }
             is TabAction.Select -> {
@@ -497,7 +498,7 @@ class HomeFragment : Fragment(), CoroutineScope {
     }
 
     private fun showCollectionCreationFragment(selectedTabId: String?) {
-        val tabs = requireComponents.core.sessionManager.sessions
+        val tabs = requireComponents.core.sessionManager.sessions.filter { !it.private }
             .map { Tab(it.id, it.url, it.url.urlToTrimmedHost(), it.title) }
 
         val viewModel = activity?.run {