No issue: Uplift update AC breaking changes and fix tab counter (#12109)

* For #11991 - Show tab count during onboarding

* Update AC to 48.0.20200627130132 and fix breaking changes

app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt

@@ -14,16 +14,18 @@ import org.mozilla.fenix.ui.robots.appContext
  * This class overrides the application's request interceptor to
  * deactivate the FxA web channel
  * which is not supported on the staging servers.
-*/
+ */
 
 class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
     override fun onLoadRequest(
         engineSession: EngineSession,
         uri: String,
         hasUserGesture: Boolean,
-        isSameDomain: Boolean
+        isSameDomain: Boolean,
+        isRedirect: Boolean
     ): RequestInterceptor.InterceptionResponse? {
         return appContext.components.services.accountsAuthFeature.interceptor.onLoadRequest(
-            engineSession, uri, hasUserGesture, isSameDomain)
+            engineSession, uri, hasUserGesture, isSameDomain, isRedirect
+        )
     }
 }

app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt

@@ -20,10 +20,11 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
         engineSession: EngineSession,
         uri: String,
         hasUserGesture: Boolean,
-        isSameDomain: Boolean
+        isSameDomain: Boolean,
+        isRedirect: Boolean
     ): RequestInterceptor.InterceptionResponse? {
         return context.components.services.appLinksInterceptor
-            .onLoadRequest(engineSession, uri, hasUserGesture, isSameDomain)
+            .onLoadRequest(engineSession, uri, hasUserGesture, isSameDomain, isRedirect)
     }
 
     override fun onErrorRequest(

app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt

@@ -126,9 +126,15 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
             searchFeature.set(
                 feature = SearchFeature(components.core.store) {
                     if (it.isPrivate) {
-                        components.useCases.searchUseCases.newPrivateTabSearch.invoke(it.query)
+                        components.useCases.searchUseCases.newPrivateTabSearch.invoke(
+                            it.query,
+                            parentSession = getSessionById()
+                        )
                     } else {
-                        components.useCases.searchUseCases.newTabSearch.invoke(it.query)
+                        components.useCases.searchUseCases.newTabSearch.invoke(
+                            it.query,
+                            parentSession = getSessionById()
+                        )
                     }
                 },
                 owner = this,

app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt

@@ -101,7 +101,10 @@ class DefaultBrowserToolbarController(
         }
 
         sessionManager.selectedSession?.searchTerms = text
-        activity.components.useCases.searchUseCases.defaultSearch.invoke(text)
+        activity.components.useCases.searchUseCases.defaultSearch.invoke(
+            text,
+            session = sessionManager.selectedSession
+        )
     }
 
     override fun handleToolbarClick() {

app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt

@@ -30,6 +30,7 @@ import androidx.constraintlayout.widget.ConstraintSet.TOP
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import androidx.core.view.doOnLayout
+import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -223,22 +224,6 @@ class HomeFragment : Fragment() {
         updateSessionControlView(view)
 
         activity.themeManager.applyStatusBarTheme(activity)
-
-        view.consumeFrom(requireComponents.core.store, viewLifecycleOwner) {
-            val tabCount = if (currentMode.getCurrentMode() == Mode.Normal) {
-                it.normalTabs.size
-            } else {
-                it.privateTabs.size
-            }
-
-            view.tab_button.setCountWithAnimation(tabCount)
-            view.add_tabs_to_collections_button?.visibility = if (tabCount > 0) {
-                View.VISIBLE
-            } else {
-                View.GONE
-            }
-        }
-
         return view
     }
 
@@ -403,6 +388,17 @@ class HomeFragment : Fragment() {
         } else {
             requireActivity().window.clearFlags(FLAG_SECURE)
         }
+
+        consumeFrom(requireComponents.core.store) {
+            val tabCount = if (browsingModeManager.mode.isPrivate) {
+                it.privateTabs.size
+            } else {
+                it.normalTabs.size
+            }
+
+            view.tab_button?.setCountWithAnimation(tabCount)
+            view.add_tabs_to_collections_button?.isVisible = tabCount > 0
+        }
     }
 
     override fun onDestroyView() {

app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt

@@ -102,13 +102,21 @@ class AwesomeBarView(
     }
 
     private val searchUseCase = object : SearchUseCases.SearchUseCase {
-        override fun invoke(searchTerms: String, searchEngine: SearchEngine?) {
+        override fun invoke(
+            searchTerms: String,
+            searchEngine: SearchEngine?,
+            parentSession: Session?
+        ) {
             interactor.onSearchTermsTapped(searchTerms)
         }
     }
 
     private val shortcutSearchUseCase = object : SearchUseCases.SearchUseCase {
-        override fun invoke(searchTerms: String, searchEngine: SearchEngine?) {
+        override fun invoke(
+            searchTerms: String,
+            searchEngine: SearchEngine?,
+            parentSession: Session?
+        ) {
             interactor.onSearchTermsTapped(searchTerms)
         }
     }

app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt

@@ -160,7 +160,7 @@ class DefaultBrowserToolbarControllerTest {
         controller.handleToolbarPasteAndGo(pastedText)
         verifyOrder {
             currentSession.searchTerms = "Mozilla"
-            searchUseCases.defaultSearch.invoke(pastedText)
+            searchUseCases.defaultSearch.invoke(pastedText, currentSession)
         }
     }
 

buildSrc/src/main/java/AndroidComponents.kt

@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "48.0.20200626213814"
+    const val VERSION = "48.0.20200627130132"
 }