From c01d3dc000cb889afe3b64920bda284e8f0a8602 Mon Sep 17 00:00:00 2001 From: ValentinTimisica Date: Tue, 15 Oct 2019 16:28:42 +0300 Subject: [PATCH 1/2] [fenix] Fixes https://github.com/mozilla-mobile/fenix/issues/5063: Added parameter customTabSessionId into ContextMenuFeature Added parameter customTabSessionId into ContextMenuFeature in BaseBrowserFragment in order to show the context menu in a custom tab. --- .../main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index 3de34e4c66..9f76b2033e 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -243,7 +243,8 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs ) ), engineView = view.engineView, - useCases = context.components.useCases.contextMenuUseCases + useCases = context.components.useCases.contextMenuUseCases, + customTabId = customTabSessionId ), owner = this, view = view From 2f19a82c91e76310025a306728ed10dbcec88ed6 Mon Sep 17 00:00:00 2001 From: Grisha Kruglov Date: Tue, 15 Oct 2019 11:00:31 -0700 Subject: [PATCH 2/2] [fenix] Revert sessionScopeToken to fix broken QR pairing flow --- .../java/org/mozilla/fenix/components/BackgroundServices.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt index 4106faef0d..b3d6101965 100644 --- a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt +++ b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt @@ -30,7 +30,6 @@ import mozilla.components.service.fxa.ServerConfig import mozilla.components.service.fxa.SyncConfig import mozilla.components.service.fxa.SyncEngine import mozilla.components.service.fxa.manager.FxaAccountManager -import mozilla.components.service.fxa.manager.SCOPE_SESSION import mozilla.components.service.fxa.manager.SCOPE_SYNC import mozilla.components.service.fxa.sync.GlobalSyncableStoreProvider import mozilla.components.support.base.log.logger.Logger @@ -159,9 +158,7 @@ class BackgroundServices( // during authentication unless we explicitly specify it below. // This is a good example of an information leak at the API level. // See https://github.com/mozilla-mobile/android-components/issues/3732 - SCOPE_SYNC, - // Necessary to enable "Manage Account" functionality. - SCOPE_SESSION + SCOPE_SYNC ) ).also { accountManager -> // TODO this needs to change once we have a SyncManager