Update AC to 48.0.20200627130132 and fix breaking changes
parent
e0fa1c0db4
commit
60069395eb
|
@ -14,16 +14,18 @@ import org.mozilla.fenix.ui.robots.appContext
|
||||||
* This class overrides the application's request interceptor to
|
* This class overrides the application's request interceptor to
|
||||||
* deactivate the FxA web channel
|
* deactivate the FxA web channel
|
||||||
* which is not supported on the staging servers.
|
* which is not supported on the staging servers.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
|
class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
|
||||||
override fun onLoadRequest(
|
override fun onLoadRequest(
|
||||||
engineSession: EngineSession,
|
engineSession: EngineSession,
|
||||||
uri: String,
|
uri: String,
|
||||||
hasUserGesture: Boolean,
|
hasUserGesture: Boolean,
|
||||||
isSameDomain: Boolean
|
isSameDomain: Boolean,
|
||||||
|
isRedirect: Boolean
|
||||||
): RequestInterceptor.InterceptionResponse? {
|
): RequestInterceptor.InterceptionResponse? {
|
||||||
return appContext.components.services.accountsAuthFeature.interceptor.onLoadRequest(
|
return appContext.components.services.accountsAuthFeature.interceptor.onLoadRequest(
|
||||||
engineSession, uri, hasUserGesture, isSameDomain)
|
engineSession, uri, hasUserGesture, isSameDomain, isRedirect
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,10 +20,11 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
|
||||||
engineSession: EngineSession,
|
engineSession: EngineSession,
|
||||||
uri: String,
|
uri: String,
|
||||||
hasUserGesture: Boolean,
|
hasUserGesture: Boolean,
|
||||||
isSameDomain: Boolean
|
isSameDomain: Boolean,
|
||||||
|
isRedirect: Boolean
|
||||||
): RequestInterceptor.InterceptionResponse? {
|
): RequestInterceptor.InterceptionResponse? {
|
||||||
return context.components.services.appLinksInterceptor
|
return context.components.services.appLinksInterceptor
|
||||||
.onLoadRequest(engineSession, uri, hasUserGesture, isSameDomain)
|
.onLoadRequest(engineSession, uri, hasUserGesture, isSameDomain, isRedirect)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onErrorRequest(
|
override fun onErrorRequest(
|
||||||
|
|
|
@ -126,9 +126,15 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
|
||||||
searchFeature.set(
|
searchFeature.set(
|
||||||
feature = SearchFeature(components.core.store) {
|
feature = SearchFeature(components.core.store) {
|
||||||
if (it.isPrivate) {
|
if (it.isPrivate) {
|
||||||
components.useCases.searchUseCases.newPrivateTabSearch.invoke(it.query)
|
components.useCases.searchUseCases.newPrivateTabSearch.invoke(
|
||||||
|
it.query,
|
||||||
|
parentSession = getSessionById()
|
||||||
|
)
|
||||||
} else {
|
} else {
|
||||||
components.useCases.searchUseCases.newTabSearch.invoke(it.query)
|
components.useCases.searchUseCases.newTabSearch.invoke(
|
||||||
|
it.query,
|
||||||
|
parentSession = getSessionById()
|
||||||
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
owner = this,
|
owner = this,
|
||||||
|
|
|
@ -101,7 +101,10 @@ class DefaultBrowserToolbarController(
|
||||||
}
|
}
|
||||||
|
|
||||||
sessionManager.selectedSession?.searchTerms = text
|
sessionManager.selectedSession?.searchTerms = text
|
||||||
activity.components.useCases.searchUseCases.defaultSearch.invoke(text)
|
activity.components.useCases.searchUseCases.defaultSearch.invoke(
|
||||||
|
text,
|
||||||
|
session = sessionManager.selectedSession
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun handleToolbarClick() {
|
override fun handleToolbarClick() {
|
||||||
|
|
|
@ -102,13 +102,21 @@ class AwesomeBarView(
|
||||||
}
|
}
|
||||||
|
|
||||||
private val searchUseCase = object : SearchUseCases.SearchUseCase {
|
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)
|
interactor.onSearchTermsTapped(searchTerms)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private val shortcutSearchUseCase = object : SearchUseCases.SearchUseCase {
|
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)
|
interactor.onSearchTermsTapped(searchTerms)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -160,7 +160,7 @@ class DefaultBrowserToolbarControllerTest {
|
||||||
controller.handleToolbarPasteAndGo(pastedText)
|
controller.handleToolbarPasteAndGo(pastedText)
|
||||||
verifyOrder {
|
verifyOrder {
|
||||||
currentSession.searchTerms = "Mozilla"
|
currentSession.searchTerms = "Mozilla"
|
||||||
searchUseCases.defaultSearch.invoke(pastedText)
|
searchUseCases.defaultSearch.invoke(pastedText, currentSession)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,5 +3,5 @@
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
object AndroidComponents {
|
object AndroidComponents {
|
||||||
const val VERSION = "48.0.20200626213814"
|
const val VERSION = "48.0.20200627130132"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue