Bug 1877277 - Translations add Check for isTranslationsEngineSupported

fenix/125.0
AndiAJ 4 months ago committed by mergify[bot]
parent cb7afcb65c
commit 2e5fc3b409

@ -300,7 +300,15 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
} }
private fun initTranslationsAction(context: Context, view: View) { private fun initTranslationsAction(context: Context, view: View) {
if (!context.settings().enableTranslations) { val isEngineSupported =
context.components.core.store.state.translationEngine.isEngineSupported
if (
!context.settings().enableTranslations &&
(
isEngineSupported == null ||
isEngineSupported == false
)
) {
return return
} }

@ -72,13 +72,16 @@ class TranslationsBinding(
// Session Translations State Behavior (Tab) // Session Translations State Behavior (Tab)
val sessionTranslationsState = state.sessionState.translationsState val sessionTranslationsState = state.sessionState.translationsState
if (sessionTranslationsState.isTranslated) { if (sessionTranslationsState.isTranslated) {
val fromSelected = sessionTranslationsState.translationEngineState?.initialFromLanguage( val fromSelected =
translateFromLanguages, sessionTranslationsState.translationEngineState?.initialFromLanguage(
) translateFromLanguages,
val toSelected = sessionTranslationsState.translationEngineState?.initialToLanguage( )
translateToLanguages, val toSelected =
) sessionTranslationsState.translationEngineState?.initialToLanguage(
translateToLanguages,
)
if (fromSelected != null && toSelected != null) { if (fromSelected != null && toSelected != null) {
onStateUpdated( onStateUpdated(

@ -198,7 +198,7 @@ open class DefaultToolbarMenu(
*/ */
@VisibleForTesting(otherwise = PRIVATE) @VisibleForTesting(otherwise = PRIVATE)
fun shouldShowTranslations(): Boolean = selectedSession?.let { fun shouldShowTranslations(): Boolean = selectedSession?.let {
context.settings().enableTranslations context.settings().enableTranslations && store.state.translationEngine.isEngineSupported == true
} ?: false } ?: false
// End of predicates // // End of predicates //

Loading…
Cancel
Save