blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Update AC to 48.0.20200627130132 and fix breaking changes

master
ekager 2020-06-27 09:43:34 -04:00 committed by Emily Kager
parent e0fa1c0db4
commit 60069395eb
7 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt
View File

@ -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
)
}
}

5
app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
View File

@ -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(

10
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -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,

5
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
View File

@ -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() {

12
app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
View File

@ -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)
}
}

2
app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
View File

@ -160,7 +160,7 @@ class DefaultBrowserToolbarControllerTest {
controller.handleToolbarPasteAndGo(pastedText)
verifyOrder {
currentSession.searchTerms = "Mozilla"
searchUseCases.defaultSearch.invoke(pastedText)
searchUseCases.defaultSearch.invoke(pastedText, currentSession)
}
}

2
buildSrc/src/main/java/AndroidComponents.kt
View File

@ -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"
}