Update Android Components version to 49.0.20200705130154.

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

@@ -22,10 +22,11 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
         uri: String,
         hasUserGesture: Boolean,
         isSameDomain: Boolean,
-        isRedirect: Boolean
+        isRedirect: Boolean,
+        isDirectNavigation: Boolean
     ): RequestInterceptor.InterceptionResponse? {
         return appContext.components.services.accountsAuthFeature.interceptor.onLoadRequest(
-            engineSession, uri, hasUserGesture, isSameDomain, isRedirect
+            engineSession, uri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation
         )
     }
 }

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

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

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

@@ -24,7 +24,6 @@ import mozilla.components.feature.app.links.AppLinksUseCases
 import mozilla.components.feature.contextmenu.ContextMenuCandidate
 import mozilla.components.feature.readerview.ReaderViewFeature
 import mozilla.components.feature.search.SearchFeature
-import mozilla.components.feature.session.TrackingProtectionUseCases
 import mozilla.components.feature.sitepermissions.SitePermissions
 import mozilla.components.feature.tab.collections.TabCollection
 import mozilla.components.feature.tabs.WindowFeature
@@ -207,11 +206,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
     override fun navToTrackingProtectionPanel(session: Session) {
         val navController = findNavController()
 
-        val useCase = TrackingProtectionUseCases(
+        requireComponents.useCases.trackingProtectionUseCases.containsException(session.id) { contains ->
-            sessionManager = requireComponents.core.sessionManager,
-            engine = requireComponents.core.engine
-        )
-        useCase.containsException(session) { contains ->
             val isEnabled = session.trackerBlockingEnabled && !contains
             val directions =
                 BrowserFragmentDirections.actionBrowserFragmentToTrackingProtectionPanelDialogFragment(

app/src/main/java/org/mozilla/fenix/components/UseCases.kt

@@ -18,6 +18,7 @@ import mozilla.components.feature.pwa.WebAppUseCases
 import mozilla.components.feature.search.SearchUseCases
 import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.feature.session.SettingsUseCases
+import mozilla.components.feature.session.TrackingProtectionUseCases
 import mozilla.components.feature.tabs.TabsUseCases
 import org.mozilla.fenix.utils.Mockable
 
@@ -42,7 +43,7 @@ class UseCases(
     /**
      * Use cases that provide tab management.
      */
-    val tabsUseCases: TabsUseCases by lazy { TabsUseCases(sessionManager) }
+    val tabsUseCases: TabsUseCases by lazy { TabsUseCases(store, sessionManager) }
 
     /**
      * Use cases that provide search engine integration.
@@ -65,4 +66,6 @@ class UseCases(
     val contextMenuUseCases by lazy { ContextMenuUseCases(sessionManager, store) }
 
     val engineSessionUseCases by lazy { EngineSessionUseCases(sessionManager) }
+
+    val trackingProtectionUseCases by lazy { TrackingProtectionUseCases(store, engine) }
 }

app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt

@@ -11,7 +11,6 @@ import androidx.core.view.isVisible
 import androidx.navigation.fragment.navArgs
 import kotlinx.android.synthetic.main.component_browser_top_toolbar.*
 import kotlinx.android.synthetic.main.fragment_browser.*
-import kotlinx.android.synthetic.main.fragment_browser.view.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import mozilla.components.browser.session.Session
 import mozilla.components.concept.engine.manifest.WebAppManifestParser
@@ -22,7 +21,6 @@ import mozilla.components.feature.pwa.feature.ManifestUpdateFeature
 import mozilla.components.feature.pwa.feature.WebAppActivityFeature
 import mozilla.components.feature.pwa.feature.WebAppHideToolbarFeature
 import mozilla.components.feature.pwa.feature.WebAppSiteControlsFeature
-import mozilla.components.feature.session.TrackingProtectionUseCases
 import mozilla.components.feature.sitepermissions.SitePermissions
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
@@ -171,11 +169,7 @@ class ExternalAppBrowserFragment : BaseBrowserFragment(), UserInteractionHandler
     }
 
     override fun navToTrackingProtectionPanel(session: Session) {
-        val useCase = TrackingProtectionUseCases(
+        requireComponents.useCases.trackingProtectionUseCases.containsException(session.id) { contains ->
-            sessionManager = requireComponents.core.sessionManager,
-            engine = requireComponents.core.engine
-        )
-        useCase.containsException(session) { contains ->
             val isEnabled = session.trackerBlockingEnabled && !contains
             val directions =
                 ExternalAppBrowserFragmentDirections

app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt

@@ -44,10 +44,7 @@ class ExceptionsFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         val view = inflater.inflate(R.layout.fragment_exceptions, container, false)
-        trackingProtectionUseCases = TrackingProtectionUseCases(
+        trackingProtectionUseCases = view.context.components.useCases.trackingProtectionUseCases
-            sessionManager = view.context.components.core.sessionManager,
-            engine = view.context.components.core.engine
-        )
         exceptionsStore = StoreProvider.get(this) {
             ExceptionsFragmentStore(
                 ExceptionsFragmentState(

app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt

@@ -61,11 +61,7 @@ class TrackingProtectionPanelDialogFragment : AppCompatDialogFragment(), UserInt
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val components = requireComponents
+        trackingProtectionUseCases = requireComponents.useCases.trackingProtectionUseCases
-        trackingProtectionUseCases = TrackingProtectionUseCases(
-            sessionManager = components.core.sessionManager,
-            engine = components.core.engine
-        )
     }
 
     override fun onCreateView(
@@ -115,7 +111,7 @@ class TrackingProtectionPanelDialogFragment : AppCompatDialogFragment(), UserInt
 
     private fun updateTrackers(session: Session) {
         trackingProtectionUseCases.fetchTrackingLogs(
-            session,
+            session.id,
             onSuccess = {
                 trackingProtectionStore.dispatch(TrackingProtectionAction.TrackerLogChange(it))
             },
@@ -150,10 +146,10 @@ class TrackingProtectionPanelDialogFragment : AppCompatDialogFragment(), UserInt
             val session = context.components.core.sessionManager.findSessionById(args.sessionId)
             session?.let {
                 if (isEnabled) {
-                    trackingProtectionUseCases.removeException(it)
+                    trackingProtectionUseCases.removeException(it.id)
                 } else {
                     context.metrics.track(Event.TrackingProtectionException)
-                    trackingProtectionUseCases.addException(it)
+                    trackingProtectionUseCases.addException(it.id)
                 }
 
                 with(context.components) {

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 = "49.0.20200702190156"
+    const val VERSION = "49.0.20200706130124"
 }