Commit ed220894 authored by MozLando's avatar MozLando
Browse files

Merge #7604 #7612 #7613 



7604: Closes #7603: Direct navigation should open in external app if user preference is on r=csadilek a=rocketsroger



7612:  GeckoView update (beta) (20200703-140633) r=Amejia481 a=MickeyMoz



7613:  GeckoView update (nightly) (20200703-140635) r=Amejia481 a=MickeyMoz



Co-authored-by: default avatarRoger Yang <royang@mozilla.com>
Co-authored-by: default avatarMickeyMoz <sebastian@mozilla.com>
parents bf3b60a6 f1a1ddf1 956cb20b fb8f7f93

buildSrc/src/main/java/Gecko.kt

+2 −2
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ internal object GeckoVersions { 
    /**

     * GeckoView Nightly Version.

     */

    const val nightly_version = "80.0.20200702094606"

    const val nightly_version = "80.0.20200703094420"



    /**

     * GeckoView Beta Version.

     */

    const val beta_version = "79.0.20200630191632"

    const val beta_version = "79.0.20200703001609"



    /**

     * GeckoView Release Version.

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

+2 −1
Original line number Diff line number Diff line
@@ -456,7 +456,8 @@ class GeckoEngineSession( 
                    request.uri,

                    request.hasUserGesture,

                    isSameDomain,

                    request.isRedirect

                    request.isRedirect,

                    request.isDirectNavigation

                )?.apply {

                    when (this) {

                        is InterceptionResponse.Content -> loadData(data, mimeType, encoding)

components/browser/engine-gecko-beta/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt

+16 −8
Original line number Diff line number Diff line
@@ -1248,7 +1248,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return RequestInterceptor.InterceptionResponse.Content("<h1>Hello World</h1>")
@@ -1277,7 +1278,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return RequestInterceptor.InterceptionResponse.Url("https://mozilla.org")
@@ -1311,7 +1313,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalled = true

                return RequestInterceptor.InterceptionResponse.Url("https://mozilla.org")
@@ -1355,7 +1358,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return null
@@ -2021,7 +2025,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.AppIntent(mock(), "result")
@@ -2071,7 +2076,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.AppIntent(mock(), "result")
@@ -2124,7 +2130,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.Url("result")
@@ -2246,7 +2253,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    fakeUrl -> null

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

+2 −1
Original line number Diff line number Diff line
@@ -456,7 +456,8 @@ class GeckoEngineSession( 
                    request.uri,

                    request.hasUserGesture,

                    isSameDomain,

                    request.isRedirect

                    request.isRedirect,

                    request.isDirectNavigation

                )?.apply {

                    when (this) {

                        is InterceptionResponse.Content -> loadData(data, mimeType, encoding)

components/browser/engine-gecko-nightly/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt

+16 −8
Original line number Diff line number Diff line
@@ -1248,7 +1248,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return RequestInterceptor.InterceptionResponse.Content("<h1>Hello World</h1>")
@@ -1277,7 +1278,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return RequestInterceptor.InterceptionResponse.Url("https://mozilla.org")
@@ -1311,7 +1313,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalled = true

                return RequestInterceptor.InterceptionResponse.Url("https://mozilla.org")
@@ -1355,7 +1358,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return null
@@ -2021,7 +2025,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.AppIntent(mock(), "result")
@@ -2071,7 +2076,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.AppIntent(mock(), "result")
@@ -2124,7 +2130,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.Url("result")
@@ -2246,7 +2253,8 @@ class GeckoEngineSessionTest { 
                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean,

                isRedirect: Boolean

                isRedirect: Boolean,

                isDirectNavigation: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    fakeUrl -> null