[fenix] Prepare for A-C Session[Manager] observable deprecation

pull/600/head
Christian Sadilek 4 years ago committed by Sebastian Kaspari
parent edb0247634
commit 5e9e8eca63

@ -156,6 +156,9 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
) { ) {
browserToolbarView.view browserToolbarView.view
} }
@Suppress("DEPRECATION")
// TODO Use browser store instead of session observer: https://github.com/mozilla-mobile/fenix/issues/16945
session?.register(toolbarSessionObserver, viewLifecycleOwner, autoPause = true) session?.register(toolbarSessionObserver, viewLifecycleOwner, autoPause = true)
if (settings.shouldShowOpenInAppCfr && session != null) { if (settings.shouldShowOpenInAppCfr && session != null) {
@ -166,6 +169,8 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
appLinksUseCases = context.components.useCases.appLinksUseCases, appLinksUseCases = context.components.useCases.appLinksUseCases,
container = browserLayout as ViewGroup container = browserLayout as ViewGroup
) )
@Suppress("DEPRECATION")
// TODO Use browser store instead of session observer: https://github.com/mozilla-mobile/fenix/issues/16949
session.register( session.register(
openInAppOnboardingObserver!!, openInAppOnboardingObserver!!,
owner = this, owner = this,
@ -174,6 +179,8 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
} }
if (!settings.userKnowsAboutPwas) { if (!settings.userKnowsAboutPwas) {
@Suppress("DEPRECATION")
// TODO Use browser store instead of session observer: https://github.com/mozilla-mobile/fenix/issues/16946
session?.register( session?.register(
PwaOnboardingObserver( PwaOnboardingObserver(
navController = findNavController(), navController = findNavController(),
@ -193,6 +200,8 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
// This observer initialized in onStart has a reference to fragment's view. // This observer initialized in onStart has a reference to fragment's view.
// Prevent it leaking the view after the latter onDestroyView. // Prevent it leaking the view after the latter onDestroyView.
if (openInAppOnboardingObserver != null) { if (openInAppOnboardingObserver != null) {
@Suppress("DEPRECATION")
// TODO Use browser store instead of session observer: https://github.com/mozilla-mobile/fenix/issues/16949
getSessionById()?.unregister(openInAppOnboardingObserver!!) getSessionById()?.unregister(openInAppOnboardingObserver!!)
openInAppOnboardingObserver = null openInAppOnboardingObserver = null
} }

@ -71,7 +71,11 @@ class TrackingProtectionPanelDialogFragment : AppCompatDialogFragment(), UserInt
): View? { ): View? {
val view = inflateRootView(container) val view = inflateRootView(container)
val session = requireComponents.core.sessionManager.findSessionById(args.sessionId) val session = requireComponents.core.sessionManager.findSessionById(args.sessionId)
@Suppress("DEPRECATION")
// TODO Use browser store instead of session observer: https://github.com/mozilla-mobile/fenix/issues/16944
session?.register(sessionObserver, view = view) session?.register(sessionObserver, view = view)
trackingProtectionStore = StoreProvider.get(this) { trackingProtectionStore = StoreProvider.get(this) {
TrackingProtectionStore( TrackingProtectionStore(
TrackingProtectionState( TrackingProtectionState(

Loading…
Cancel
Save