Merge branch 'bug_40074_96.0.15' into 'android-components-96.0.15-11.5-1' (992d53f7) · Commits · The Tor Project / Applications / android-components

build.gradle

+7 −1

Changes for build.gradle: 7 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -118,7 +118,13 @@ subprojects {
		rename { 'manifest.json' }
		into extDir

		def values = ['version': rootProject.ext.config.componentsVersion + "." + new Date().format('MMddHHmmss')]
		def systemEnvBuildDate = System.getenv('MOZ_BUILD_DATE')
		// MOZ_BUILD_DATE is in the YYYYMMDDHHMMSS format. Thus, we only use a
		// substring of it if it is available.
		def values = ['version': rootProject.ext.config.componentsVersion + "." +
		(systemEnvBuildDate != null ?
		systemEnvBuildDate.substring(4) :
		new Date().format('MMddHHmmss'))]
		inputs.properties(values)
		expand(values)
		}

components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt

+18 −0

Changes for components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt: 18 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -687,6 +687,22 @@ class GeckoEngine(
		Engine.HttpsOnlyMode.ENABLED -> GeckoRuntimeSettings.HTTPS_ONLY
		}
		}

		override var torSecurityLevel: Int
		get() = runtime.settings.torSecurityLevel
		set(value) {
		value.let {
		runtime.settings.torSecurityLevel = it
		}
		}
		override var spoofEnglish: Boolean
		get() = runtime.settings.spoofEnglish
		set(value) {
		value.let {
		runtime.settings.spoofEnglish = it
		localeUpdater.updateValue()
		}
		}
		}.apply {
		defaultSettings?.let {
		this.javascriptEnabled = it.javascriptEnabled
		@@ -706,6 +722,8 @@ class GeckoEngine(
		this.loginAutofillEnabled = it.loginAutofillEnabled
		this.enterpriseRootsEnabled = it.enterpriseRootsEnabled
		this.httpsOnlyMode = it.httpsOnlyMode
		this.torSecurityLevel = it.torSecurityLevel
		this.spoofEnglish = it.spoofEnglish
		}
		}

components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt

+1 −0

Changes for components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url)
		.addHeadersFrom(this)
		.addBodyFrom(this)
		.cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD)
		.origin(origin)
		.build()

		private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder {

components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt

+2 −1

Changes for components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -57,7 +57,8 @@ open class HttpIconLoader(
		readTimeout = Pair(READ_TIMEOUT, TimeUnit.SECONDS),
		redirect = Request.Redirect.FOLLOW,
		useCaches = true,
		private = request.isPrivate
		private = request.isPrivate,
		origin = request.url
		)

		return try {

components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt

+6 −21

Changes for components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt: 6 added lines, 21 removed lines.
Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@ import androidx.annotation.ColorRes
		import androidx.annotation.DrawableRes
		import mozilla.components.browser.menu.item.BackPressMenuItem
		import mozilla.components.browser.menu.item.BrowserMenuDivider
		import mozilla.components.browser.menu.item.BrowserMenuImageText
		import mozilla.components.browser.menu.item.NO_ID
		import mozilla.components.browser.menu.item.ParentBrowserMenuItem
		import mozilla.components.browser.menu.item.WebExtensionBrowserMenuItem
		@@ -96,20 +95,10 @@ class WebExtensionBrowserMenuBuilder(
		iconTintColorResource = style.webExtIconTintColorResource
		)

		val addonsManagerMenuItem = BrowserMenuImageText(
		label = context.getString(R.string.mozac_browser_menu_addons_manager),
		imageResource = style.addonsManagerMenuItemDrawableRes,
		iconTintColorResource = style.webExtIconTintColorResource
		) {
		onAddonsManagerTapped.invoke()
		}

		val webExtSubMenuItems = if (appendExtensionSubMenuAtStart) {
		listOf(backPressMenuItem) + BrowserMenuDivider() +
		filteredExtensionMenuItems +
		BrowserMenuDivider() + addonsManagerMenuItem
		filteredExtensionMenuItems
		} else {
		listOf(addonsManagerMenuItem) + BrowserMenuDivider() +
		filteredExtensionMenuItems +
		BrowserMenuDivider() + backPressMenuItem
		}
		@@ -125,25 +114,21 @@ class WebExtensionBrowserMenuBuilder(
		endOfMenuAlwaysVisible = endOfMenuAlwaysVisible
		)
		} else {
		BrowserMenuImageText(
		label = context.getString(R.string.mozac_browser_menu_addons),
		imageResource = style.addonsManagerMenuItemDrawableRes,
		iconTintColorResource = style.webExtIconTintColorResource
		) {
		onAddonsManagerTapped.invoke()
		}
		null
		}
		val mainMenuIndex = items.indexOfFirst { browserMenuItem ->
		(browserMenuItem as? WebExtensionPlaceholderMenuItem)?.id ==
		WebExtensionPlaceholderMenuItem.MAIN_EXTENSIONS_MENU_ID
		}

		return if (mainMenuIndex != -1) {
		return if (mainMenuIndex != -1 && addonsMenuItem != null) {
		items[mainMenuIndex] = addonsMenuItem
		items
		// if we do not have a placeholder we should add the extension submenu at top or bottom
		} else {
		if (appendExtensionSubMenuAtStart) {
		if (addonsMenuItem == null) {
		items
		} else if (appendExtensionSubMenuAtStart) {
		listOf(addonsMenuItem) + items
		} else {
		items + addonsMenuItem