From 05675f9e941b563c11851839ef26a8858df4a0cf Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Mon, 27 Jul 2020 19:03:45 -0400
Subject: [PATCH] [fenix] Closes
 https://github.com/mozilla-mobile/fenix/issues/12670: Add lastUri as a
 parameter in RequestInterceptor

---
 .../java/org/mozilla/fenix/AppRequestInterceptor.kt            | 3 ++-
 app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt b/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt
index 906e84f6bf..c16ee4d63d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt
@@ -20,6 +20,7 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
     override fun onLoadRequest(
         engineSession: EngineSession,
         uri: String,
+        lastUri: String?,
         hasUserGesture: Boolean,
         isSameDomain: Boolean,
         isRedirect: Boolean,
@@ -27,7 +28,7 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
         isSubframeRequest: Boolean
     ): RequestInterceptor.InterceptionResponse? {
         return appContext.components.services.accountsAuthFeature.interceptor.onLoadRequest(
-            engineSession, uri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation, isSubframeRequest
+            engineSession, uri, lastUri, 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 85057009a1..312460f1d8 100644
--- a/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
+++ b/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
@@ -19,6 +19,7 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
     override fun onLoadRequest(
         engineSession: EngineSession,
         uri: String,
+        lastUri: String?,
         hasUserGesture: Boolean,
         isSameDomain: Boolean,
         isRedirect: Boolean,
@@ -27,7 +28,7 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
     ): RequestInterceptor.InterceptionResponse? {
         return context.components.services.appLinksInterceptor
             .onLoadRequest(
-                engineSession, uri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation, isSubframeRequest
+                engineSession, uri, lastUri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation, isSubframeRequest
             )
     }