brizental pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project /
Applications / Tor Browser
Commits:
e0d93da7 by Beatriz Rizental at 2025-09-15T09:55:47+02:00
fixup! TB 34403 [android]: Disable Normal mode by default.
- - - - -
1 changed file:
-
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/search/ApplicationSearchMiddleware.kt
Changes:
=====================================
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/search/ApplicationSearchMiddleware.kt
=====================================
@@ -19,6 +19,7 @@ import
mozilla.components.feature.search.ext.createApplicationSearchEngine
import mozilla.components.lib.state.Middleware
import mozilla.components.lib.state.MiddlewareContext
import mozilla.components.lib.state.Store
+import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.R
const val HISTORY_SEARCH_ENGINE_ID = "history_search_engine_id"
@@ -34,18 +35,18 @@ const val TABS_SEARCH_ENGINE_ID = "tabs_search_engine_id"
* @param scope [CoroutineScope] used to launch coroutines.
*/
class ApplicationSearchMiddleware(
- context: Context,
+ private val context: Context,
private val stringProvider: (Int) -> String = { context.getString(it) },
private val bitmapProvider: (Int) -> Bitmap = { getDrawable(context,
it)?.toBitmap()!! },
private val scope: CoroutineScope = CoroutineScope(Dispatchers.IO),
) : Middleware<BrowserState, BrowserAction> {
override fun invoke(
- context: MiddlewareContext<BrowserState, BrowserAction>,
+ middlewareContext: MiddlewareContext<BrowserState, BrowserAction>,
next: (BrowserAction) -> Unit,
action: BrowserAction,
) {
if (action is InitAction) {
- loadSearchEngines(context.store)
+ loadSearchEngines(middlewareContext.store)
}
next(action)
@@ -54,7 +55,7 @@ class ApplicationSearchMiddleware(
private fun loadSearchEngines(
store: Store<BrowserState, BrowserAction>,
) = scope.launch {
- val searchEngines = listOf(
+ val searchEngines = listOfNotNull(
createApplicationSearchEngine(
id = BOOKMARKS_SEARCH_ENGINE_ID,
name = stringProvider(R.string.library_bookmarks),
@@ -72,7 +73,7 @@ class ApplicationSearchMiddleware(
name = stringProvider(R.string.library_history),
url = "",
icon = bitmapProvider(R.drawable.ic_history_search),
- ),
+ ).takeIf { !context.settings().shouldDisableNormalMode },
)
store.dispatch(SearchAction.ApplicationSearchEnginesLoaded(searchEngines))
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e0d93da74a35a8da948a6e5bbd0295258a1373aa
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e0d93da74a35a8da948a6e5bbd0295258a1373aa
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tor-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
