blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Merge #6025 #6032 

6025: For #5063: Added parameter customTabSessionId into ContextMenuFeature r=ekager a=ValentinTimisica

Added parameter customTabSessionId into ContextMenuFeature in
BaseBrowserFragment in order to show the context menu in a custom tab.



6032: For #5990: Revert sessionTokenScope to fix broken QR pairing flow r=ekager a=grigoryk

Seems like addition of sessionTokenScope is causing issues with pairing. For now, we can revert that change until the underlying issue is fixed.

For #5990.



Co-authored-by: ValentinTimisica <valentin.timisica@softvision.ro>
Co-authored-by: Grisha Kruglov <gkruglov@mozilla.com>
master
MozLando 2019-10-15 21:31:38 +00:00
parent 662be3f686 6fa9572ccf 031f923273
commit a1f96a0ec7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
View File

@ -243,7 +243,8 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
) )
), ),
engineView = view.engineView, engineView = view.engineView,
useCases = context.components.useCases.contextMenuUseCases useCases = context.components.useCases.contextMenuUseCases,
customTabId = customTabSessionId
), ),
owner = this, owner = this,
view = view view = view

5
app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
View File

@ -30,7 +30,6 @@ import mozilla.components.service.fxa.ServerConfig
import mozilla.components.service.fxa.SyncConfig import mozilla.components.service.fxa.SyncConfig
import mozilla.components.service.fxa.SyncEngine import mozilla.components.service.fxa.SyncEngine
import mozilla.components.service.fxa.manager.FxaAccountManager 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.manager.SCOPE_SYNC
import mozilla.components.service.fxa.sync.GlobalSyncableStoreProvider import mozilla.components.service.fxa.sync.GlobalSyncableStoreProvider
import mozilla.components.support.base.log.logger.Logger import mozilla.components.support.base.log.logger.Logger
@ -159,9 +158,7 @@ class BackgroundServices(
// during authentication unless we explicitly specify it below. // during authentication unless we explicitly specify it below.
// This is a good example of an information leak at the API level. // This is a good example of an information leak at the API level.
// See https://github.com/mozilla-mobile/android-components/issues/3732 // See https://github.com/mozilla-mobile/android-components/issues/3732
SCOPE_SYNC, SCOPE_SYNC
// Necessary to enable "Manage Account" functionality.
SCOPE_SESSION
) )
).also { accountManager -> ).also { accountManager ->
// TODO this needs to change once we have a SyncManager // TODO this needs to change once we have a SyncManager