Issue #10114: (Merge day) browser-engine-gecko-beta (88) -> browser-engine-gecko (88) (52aa1180) · Commits · The Tor Project / Applications / android-components

buildSrc/src/main/java/Gecko.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ internal object GeckoVersions {
		/**
		* GeckoView Release Version.
		*/
		const val release_version = "87.0.20210318103112"
		const val release_version = "88.0.20210415204500"
		}

		@Suppress("Unused", "MaxLineLength")

+2 −2

Original line number	Diff line number	Diff line
		@@ -299,9 +299,9 @@ class GeckoEngine(
		override fun onInstallPrompt(ext: org.mozilla.geckoview.WebExtension): GeckoResult<AllowOrDeny>? {
		val extension = GeckoWebExtension(ext, runtime)
		return if (webExtensionDelegate.onInstallPermissionRequest(extension)) {
		GeckoResult.ALLOW
		GeckoResult.allow()
		} else {
		GeckoResult.DENY
		GeckoResult.deny()
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -119,11 +119,11 @@ open class NestedGeckoView(context: Context) : GeckoView(context), NestedScrolli

		@VisibleForTesting
		internal fun updateInputResult(event: MotionEvent) {
		super.onTouchEventForResult(event)
		super.onTouchEventForDetailResult(event)
		.accept {
		// This should never be null.
		// Prefer to crash and investigate after rather than not knowing about problems with this.
		inputResult = it!!
		inputResult = it?.handledResult()!!
		startNestedScroll(ViewCompat.SCROLL_AXIS_VERTICAL)
		}
		}

+7 −2

Original line number	Diff line number	Diff line
		@@ -58,8 +58,13 @@ open class GeckoSelectionActionDelegate(
		}

		override fun performAction(id: String, item: MenuItem): Boolean {
		/* Temporary, removed once https://bugzilla.mozilla.org/show_bug.cgi?id=1694983 is fixed */
		try {
		val selectedText = mSelection?.text ?: return super.performAction(id, item)

		return customDelegate.performAction(id, selectedText) \|\| super.performAction(id, item)
		} catch (e: SecurityException) {
		return false
		}
		}
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -302,9 +302,9 @@ class GeckoWebExtension(
		tabDetails.active == true,
		tabDetails.url)
		) {
		GeckoResult.ALLOW
		GeckoResult.allow()
		} else {
		GeckoResult.DENY
		GeckoResult.deny()
		}
		}

		@@ -315,12 +315,12 @@ class GeckoWebExtension(

		return if (ext != null) {
		if (tabHandler.onCloseTab(this@GeckoWebExtension, session)) {
		GeckoResult.ALLOW
		GeckoResult.allow()
		} else {
		GeckoResult.DENY
		GeckoResult.deny()
		}
		} else {
		GeckoResult.DENY
		GeckoResult.deny()
		}
		}
		}