Skip to content
Snippets Groups Projects
Verified Commit 00807e3e authored by cypherpunks1's avatar cypherpunks1 Committed by Pier Angelo Vendrame
Browse files

fixup! [android] Disable features and functionality

Bug 41550: Disable and remove the fxawebchannel extension
parent 2f517495
Branches
Tags
1 merge request!1222Bug 43166: Rebased alpha onto 128.3.0esr
......@@ -8,6 +8,10 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
android {
androidResources {
ignoreAssetsPattern '!<dir>extensions'
}
defaultConfig {
minSdkVersion config.minSdkVersion
compileSdk config.compileSdkVersion
......
......@@ -67,8 +67,8 @@ import mozilla.components.concept.base.crash.Breadcrumb
import mozilla.components.concept.engine.permission.SitePermissions
import mozilla.components.concept.engine.prompt.ShareData
import mozilla.components.concept.storage.LoginEntry
import mozilla.components.feature.accounts.FxaCapability
import mozilla.components.feature.accounts.FxaWebChannelFeature
// import mozilla.components.feature.accounts.FxaCapability
// import mozilla.components.feature.accounts.FxaWebChannelFeature
import mozilla.components.feature.app.links.AppLinksFeature
import mozilla.components.feature.contextmenu.ContextMenuCandidate
import mozilla.components.feature.contextmenu.ContextMenuFeature
......@@ -254,7 +254,7 @@ abstract class BaseBrowserFragment :
private val sitePermissionsFeature = ViewBoundFeatureWrapper<SitePermissionsFeature>()
private val fullScreenFeature = ViewBoundFeatureWrapper<FullScreenFeature>()
private val swipeRefreshFeature = ViewBoundFeatureWrapper<SwipeRefreshFeature>()
private val webchannelIntegration = ViewBoundFeatureWrapper<FxaWebChannelFeature>()
// private val webchannelIntegration = ViewBoundFeatureWrapper<FxaWebChannelFeature>()
private val sitePermissionWifiIntegration =
ViewBoundFeatureWrapper<SitePermissionsWifiIntegration>()
private val secureWindowFeature = ViewBoundFeatureWrapper<SecureWindowFeature>()
......@@ -1022,6 +1022,7 @@ abstract class BaseBrowserFragment :
)
}
/*
webchannelIntegration.set(
feature = FxaWebChannelFeature(
customTabSessionId,
......@@ -1034,6 +1035,7 @@ abstract class BaseBrowserFragment :
owner = this,
view = view,
)
*/
initializeEngineView(
topToolbarHeight = context.settings().getTopToolbarHeight(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment