Copione merged onto master
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
536cd1b880
|
@ -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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -272,7 +272,7 @@
|
||||||
<!-- Preference title for switch preference to show search shortcuts -->
|
<!-- Preference title for switch preference to show search shortcuts -->
|
||||||
<string name="preferences_show_search_shortcuts">Mostra le scorciatoie di ricerca</string>
|
<string name="preferences_show_search_shortcuts">Mostra le scorciatoie di ricerca</string>
|
||||||
<!-- Preference title for switch preference to show search suggestions -->
|
<!-- Preference title for switch preference to show search suggestions -->
|
||||||
<string name="preferences_show_search_suggestions">Visualizza suggerimenti</string>
|
<string name="preferences_show_search_suggestions">Mostra suggerimenti di ricerca</string>
|
||||||
<!-- Preference title for switch preference to show voice search button -->
|
<!-- Preference title for switch preference to show voice search button -->
|
||||||
<string name="preferences_show_voice_search">Mostra ricerca vocale</string>
|
<string name="preferences_show_voice_search">Mostra ricerca vocale</string>
|
||||||
<!-- Preference title for switch preference to show search suggestions also in private mode -->
|
<!-- Preference title for switch preference to show search suggestions also in private mode -->
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<!-- App name for private browsing mode, only the "Private" portion should be localized. -->
|
|
||||||
<string name="app_name_private_2">தனிப்பட்ட பயர்பாக்சு முன்னோட்டம்</string>
|
|
||||||
<!-- Home Fragment -->
|
<!-- Home Fragment -->
|
||||||
<!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
|
<!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
|
||||||
<string name="content_description_menu">கூடுதல் தேர்வுகள்</string>
|
<string name="content_description_menu">கூடுதல் தேர்வுகள்</string>
|
||||||
|
@ -13,8 +11,6 @@
|
||||||
<string name="search_hint">தேடு/முகவரியை உள்ளிடு</string>
|
<string name="search_hint">தேடு/முகவரியை உள்ளிடு</string>
|
||||||
|
|
||||||
|
|
||||||
<!-- No Open Tabs Message Header -->
|
|
||||||
<string name="no_open_tabs_header_2">திறந்த கீற்றுகள் இல்லை</string>
|
|
||||||
<!-- No Open Tabs Message Description -->
|
<!-- No Open Tabs Message Description -->
|
||||||
<string name="no_open_tabs_description">உங்கள் திறந்த கீற்றுகள் இங்கே காண்பிக்கப்படும்.</string>
|
<string name="no_open_tabs_description">உங்கள் திறந்த கீற்றுகள் இங்கே காண்பிக்கப்படும்.</string>
|
||||||
|
|
||||||
|
@ -54,8 +50,6 @@
|
||||||
<string name="browser_menu_help">உதவி</string>
|
<string name="browser_menu_help">உதவி</string>
|
||||||
<!-- Browser menu button that opens the settings menu -->
|
<!-- Browser menu button that opens the settings menu -->
|
||||||
<string name="browser_menu_settings">அமைப்புகள்</string>
|
<string name="browser_menu_settings">அமைப்புகள்</string>
|
||||||
<!-- Browser menu button that opens a user's library -->
|
|
||||||
<string name="browser_menu_your_library">உங்கள் நூலகம்</string>
|
|
||||||
<!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
|
<!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
|
||||||
<string name="browser_menu_add_to_homescreen">முகப்பு திரையில் சேர்</string>
|
<string name="browser_menu_add_to_homescreen">முகப்பு திரையில் சேர்</string>
|
||||||
<!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
|
<!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
|
||||||
|
@ -67,10 +61,6 @@
|
||||||
<!-- Browser menu button that creates a new tab -->
|
<!-- Browser menu button that creates a new tab -->
|
||||||
<string name="browser_menu_new_tab">புதிய கீற்று</string>
|
<string name="browser_menu_new_tab">புதிய கீற்று</string>
|
||||||
|
|
||||||
<!-- Browser menu button that saves the current tab to a collection -->
|
|
||||||
<string name="browser_menu_save_to_collection">சேகரிப்பில் சேமிக்கவும்</string>
|
|
||||||
<!-- Browser menu button that opens a dialog to report issues with the current site -->
|
|
||||||
<string name="browser_menu_report_issue">தள சிக்கலைப் புகாரளிக்கவும்</string>
|
|
||||||
<!-- Browser menu button that open a share menu to share the current site -->
|
<!-- Browser menu button that open a share menu to share the current site -->
|
||||||
<string name="browser_menu_share">பகிர்</string>
|
<string name="browser_menu_share">பகிர்</string>
|
||||||
<!-- Share menu title, displayed when a user is sharing their current site -->
|
<!-- Share menu title, displayed when a user is sharing their current site -->
|
||||||
|
@ -81,7 +71,10 @@
|
||||||
<!-- Browser menu text shown in custom tabs to indicate this is a Fenix tab
|
<!-- Browser menu text shown in custom tabs to indicate this is a Fenix tab
|
||||||
The first parameter is the name of the app defined in app_name (for example: Fenix) -->
|
The first parameter is the name of the app defined in app_name (for example: Fenix) -->
|
||||||
<string name="browser_menu_powered_by">%1$s ஆல் இயக்கப்படுகிறது</string>
|
<string name="browser_menu_powered_by">%1$s ஆல் இயக்கப்படுகிறது</string>
|
||||||
<!-- Browser menu button to put the the current page in reader mode -->
|
<!-- Browser menu text shown in custom tabs to indicate this is a Fenix tab
|
||||||
|
The first parameter is the name of the app defined in app_name (for example: Fenix) -->
|
||||||
|
<string name="browser_menu_powered_by2">%1$s மூலம் இயக்கப்படுகிறது</string>
|
||||||
|
<!-- Browser menu button to put the current page in reader mode -->
|
||||||
<string name="browser_menu_read">வாசகர் பார்வை</string>
|
<string name="browser_menu_read">வாசகர் பார்வை</string>
|
||||||
<!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
|
<!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
|
||||||
<string name="browser_menu_read_appearance">தோற்றம்</string>
|
<string name="browser_menu_read_appearance">தோற்றம்</string>
|
||||||
|
@ -142,4 +135,11 @@
|
||||||
<!-- Preference for opening links in a private tab-->
|
<!-- Preference for opening links in a private tab-->
|
||||||
<string name="preferences_open_links_in_a_private_tab">இணைப்பைக் கமுக்க கீற்றில் திறக்க</string>
|
<string name="preferences_open_links_in_a_private_tab">இணைப்பைக் கமுக்க கீற்றில் திறக்க</string>
|
||||||
|
|
||||||
|
<!-- Preference for adding private browsing shortcut -->
|
||||||
|
<string name="preferences_add_private_browsing_shortcut">கமுக்க உலாவல் குறுக்குவழியைச் சேர்க்கவும்</string>
|
||||||
|
<!-- Preference for accessibility -->
|
||||||
|
<string name="preferences_accessibility">அணுகுத்திறன்</string>
|
||||||
|
<!-- Preference category for account information -->
|
||||||
|
<string name="preferences_category_account">கணக்கு</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -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.20200628130058"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue