From 60069395eb7c2e74136a7a56fdad2b6ebd4cbcc0 Mon Sep 17 00:00:00 2001 From: ekager Date: Sat, 27 Jun 2020 09:43:34 -0400 Subject: [PATCH] Update AC to 48.0.20200627130132 and fix breaking changes --- .../java/org/mozilla/fenix/AppRequestInterceptor.kt | 8 +++++--- .../java/org/mozilla/fenix/AppRequestInterceptor.kt | 5 +++-- .../org/mozilla/fenix/browser/BrowserFragment.kt | 10 ++++++++-- .../components/toolbar/BrowserToolbarController.kt | 5 ++++- .../fenix/search/awesomebar/AwesomeBarView.kt | 12 ++++++++++-- .../toolbar/DefaultBrowserToolbarControllerTest.kt | 2 +- buildSrc/src/main/java/AndroidComponents.kt | 2 +- 7 files changed, 32 insertions(+), 12 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt b/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt index 28c651dc9..3819ec015 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt @@ -14,16 +14,18 @@ import org.mozilla.fenix.ui.robots.appContext * This class overrides the application's request interceptor to * deactivate the FxA web channel * which is not supported on the staging servers. -*/ + */ class AppRequestInterceptor(private val context: Context) : RequestInterceptor { override fun onLoadRequest( engineSession: EngineSession, uri: String, hasUserGesture: Boolean, - isSameDomain: Boolean + isSameDomain: Boolean, + isRedirect: Boolean ): RequestInterceptor.InterceptionResponse? { return appContext.components.services.accountsAuthFeature.interceptor.onLoadRequest( - engineSession, uri, hasUserGesture, isSameDomain) + engineSession, uri, hasUserGesture, isSameDomain, isRedirect + ) } } diff --git a/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt b/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt index 246fc327e..d03aed8ba 100644 --- a/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt +++ b/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt @@ -20,10 +20,11 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor { engineSession: EngineSession, uri: String, hasUserGesture: Boolean, - isSameDomain: Boolean + isSameDomain: Boolean, + isRedirect: Boolean ): RequestInterceptor.InterceptionResponse? { return context.components.services.appLinksInterceptor - .onLoadRequest(engineSession, uri, hasUserGesture, isSameDomain) + .onLoadRequest(engineSession, uri, hasUserGesture, isSameDomain, isRedirect) } override fun onErrorRequest( diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index a932686cf..b95d14715 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -126,9 +126,15 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler { searchFeature.set( feature = SearchFeature(components.core.store) { if (it.isPrivate) { - components.useCases.searchUseCases.newPrivateTabSearch.invoke(it.query) + components.useCases.searchUseCases.newPrivateTabSearch.invoke( + it.query, + parentSession = getSessionById() + ) } else { - components.useCases.searchUseCases.newTabSearch.invoke(it.query) + components.useCases.searchUseCases.newTabSearch.invoke( + it.query, + parentSession = getSessionById() + ) } }, owner = this, diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt index 57221f839..0e32b8316 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt @@ -101,7 +101,10 @@ class DefaultBrowserToolbarController( } sessionManager.selectedSession?.searchTerms = text - activity.components.useCases.searchUseCases.defaultSearch.invoke(text) + activity.components.useCases.searchUseCases.defaultSearch.invoke( + text, + session = sessionManager.selectedSession + ) } override fun handleToolbarClick() { diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt index f413511e1..a0d479343 100644 --- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt @@ -102,13 +102,21 @@ class AwesomeBarView( } private val searchUseCase = object : SearchUseCases.SearchUseCase { - override fun invoke(searchTerms: String, searchEngine: SearchEngine?) { + override fun invoke( + searchTerms: String, + searchEngine: SearchEngine?, + parentSession: Session? + ) { interactor.onSearchTermsTapped(searchTerms) } } private val shortcutSearchUseCase = object : SearchUseCases.SearchUseCase { - override fun invoke(searchTerms: String, searchEngine: SearchEngine?) { + override fun invoke( + searchTerms: String, + searchEngine: SearchEngine?, + parentSession: Session? + ) { interactor.onSearchTermsTapped(searchTerms) } } diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt index 8adeadbcd..998a84232 100644 --- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt @@ -160,7 +160,7 @@ class DefaultBrowserToolbarControllerTest { controller.handleToolbarPasteAndGo(pastedText) verifyOrder { currentSession.searchTerms = "Mozilla" - searchUseCases.defaultSearch.invoke(pastedText) + searchUseCases.defaultSearch.invoke(pastedText, currentSession) } } diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt index 0b2276e7f..b3fcce2bc 100644 --- a/buildSrc/src/main/java/AndroidComponents.kt +++ b/buildSrc/src/main/java/AndroidComponents.kt @@ -3,5 +3,5 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ object AndroidComponents { - const val VERSION = "48.0.20200626213814" + const val VERSION = "48.0.20200627130132" }