From 7923255fda3f145860591fdd126c7f14b5e2253b Mon Sep 17 00:00:00 2001 From: Roger Yang Date: Tue, 14 Jul 2020 15:25:05 -0400 Subject: [PATCH] For #12118: Add isSubframeRequest parameter for app links --- .../java/org/mozilla/fenix/AppRequestInterceptor.kt | 5 +++-- .../main/java/org/mozilla/fenix/AppRequestInterceptor.kt | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt b/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt index f59bb885e..906e84f6b 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt @@ -23,10 +23,11 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor { hasUserGesture: Boolean, isSameDomain: Boolean, isRedirect: Boolean, - isDirectNavigation: Boolean + isDirectNavigation: Boolean, + isSubframeRequest: Boolean ): RequestInterceptor.InterceptionResponse? { return appContext.components.services.accountsAuthFeature.interceptor.onLoadRequest( - engineSession, uri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation + engineSession, uri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation, isSubframeRequest ) } } diff --git a/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt b/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt index eca6187c5..85057009a 100644 --- a/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt +++ b/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt @@ -22,10 +22,13 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor { hasUserGesture: Boolean, isSameDomain: Boolean, isRedirect: Boolean, - isDirectNavigation: Boolean + isDirectNavigation: Boolean, + isSubframeRequest: Boolean ): RequestInterceptor.InterceptionResponse? { return context.components.services.appLinksInterceptor - .onLoadRequest(engineSession, uri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation) + .onLoadRequest( + engineSession, uri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation, isSubframeRequest + ) } override fun onErrorRequest(