Commit c80bda75 authored by MozLando's avatar MozLando
Browse files

Merge #7509 



7509: Closes #7507: Redirect should open in external app if user preference is on r=jonalmeida a=rocketsroger



Co-authored-by: default avatarRoger Yang <royang@mozilla.com>
parents c26ea69b de0393fe

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
@@ -455,7 +455,8 @@ class GeckoEngineSession( 
                    engineSession,

                    request.uri,

                    request.hasUserGesture,

                    isSameDomain

                    isSameDomain,

                    request.isRedirect

                )?.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
@@ -1247,7 +1247,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return RequestInterceptor.InterceptionResponse.Content("<h1>Hello World</h1>")
@@ -1275,7 +1276,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return RequestInterceptor.InterceptionResponse.Url("https://mozilla.org")
@@ -1308,7 +1310,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalled = true

                return RequestInterceptor.InterceptionResponse.Url("https://mozilla.org")
@@ -1351,7 +1354,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return null
@@ -2016,7 +2020,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.AppIntent(mock(), "result")
@@ -2065,7 +2070,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.AppIntent(mock(), "result")
@@ -2117,7 +2123,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.Url("result")
@@ -2238,7 +2245,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: 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
@@ -455,7 +455,8 @@ class GeckoEngineSession( 
                    engineSession,

                    request.uri,

                    request.hasUserGesture,

                    isSameDomain

                    isSameDomain,

                    request.isRedirect

                )?.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
@@ -1247,7 +1247,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return RequestInterceptor.InterceptionResponse.Content("<h1>Hello World</h1>")
@@ -1275,7 +1276,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return RequestInterceptor.InterceptionResponse.Url("https://mozilla.org")
@@ -1308,7 +1310,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalled = true

                return RequestInterceptor.InterceptionResponse.Url("https://mozilla.org")
@@ -1351,7 +1354,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                interceptorCalledWithUri = uri

                return null
@@ -2016,7 +2020,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.AppIntent(mock(), "result")
@@ -2065,7 +2070,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.AppIntent(mock(), "result")
@@ -2117,7 +2123,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    "sample:about" -> RequestInterceptor.InterceptionResponse.Url("result")
@@ -2238,7 +2245,8 @@ class GeckoEngineSessionTest { 
                engineSession: EngineSession,

                uri: String,

                hasUserGesture: Boolean,

                isSameDomain: Boolean

                isSameDomain: Boolean,

                isRedirect: Boolean

            ): RequestInterceptor.InterceptionResponse? {

                return when (uri) {

                    fakeUrl -> null

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

+2 −1
Original line number Diff line number Diff line
@@ -368,7 +368,8 @@ class GeckoEngineSession( 
                    engineSession,

                    request.uri,

                    request.hasUserGesture,

                    isSameDomain

                    isSameDomain,

                    request.isRedirect

                )?.apply {

                    when (this) {

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