TB 34403: [android] Disable Normal mode by default. (77613c1f) · Commits · The Tor Project / Applications / Tor Browser

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt

+9 −7

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ import androidx.compose.ui.text.style.TextAlign
		import androidx.compose.ui.text.style.TextOverflow
		import androidx.compose.ui.unit.dp
		import androidx.core.graphics.toColorInt
		import androidx.compose.ui.platform.LocalContext
		import androidx.navigation.NavHostController
		import androidx.navigation.compose.NavHost
		import androidx.navigation.compose.composable
		@@ -129,6 +130,7 @@ import org.mozilla.fenix.compose.list.SelectableFaviconListItem
		import org.mozilla.fenix.compose.list.SelectableIconListItem
		import org.mozilla.fenix.ext.components
		import org.mozilla.fenix.ext.getRootView
		import org.mozilla.fenix.ext.components
		import org.mozilla.fenix.search.SearchFragmentAction.SuggestionClicked
		import org.mozilla.fenix.search.SearchFragmentAction.SuggestionSelected
		import org.mozilla.fenix.search.SearchFragmentState
		@@ -1120,7 +1122,7 @@ private fun BookmarkListOverflowMenu(
		onDismissRequest: () -> Unit,
		store: BookmarksStore,
		) {
		val menuItems = listOf(
		val menuItems = listOfNotNull(
		MenuItem.TextItem(
		text = Text.Resource(R.string.bookmark_menu_select_all_bookmarks),
		onClick = { store.dispatch(BookmarksListMenuAction.SelectAll) },
		@@ -1128,7 +1130,7 @@ private fun BookmarkListOverflowMenu(
		MenuItem.TextItem(
		text = Text.Resource(R.string.bookmark_menu_open_in_new_tab_button),
		onClick = { store.dispatch(BookmarksListMenuAction.MultiSelect.OpenInNormalTabsClicked) },
		),
		).takeIf { !LocalContext.current.components.settings.shouldDisableNormalMode },
		MenuItem.TextItem(
		text = Text.Resource(R.string.bookmark_menu_open_in_private_tab_button),
		onClick = { store.dispatch(BookmarksListMenuAction.MultiSelect.OpenInPrivateTabsClicked) },
		@@ -1156,7 +1158,7 @@ private fun FolderListOverflowMenu(
		onDismissRequest: () -> Unit,
		store: BookmarksStore,
		) {
		val menuItems = listOf(
		val menuItems = listOfNotNull(
		MenuItem.TextItem(
		text = Text.Resource(R.string.bookmark_menu_select_all_bookmarks),
		onClick = { store.dispatch(BookmarksListMenuAction.SelectAll) },
		@@ -1189,7 +1191,7 @@ private fun BookmarkListItemMenu(
		bookmark: BookmarkItem.Bookmark,
		store: BookmarksStore,
		) {
		val menuItems = listOf(
		val menuItems = listOfNotNull(
		MenuItem.TextItem(
		text = Text.Resource(R.string.bookmark_menu_select_button),
		onClick = { store.dispatch(BookmarksListMenuAction.Bookmark.SelectClicked(bookmark)) },
		@@ -1211,7 +1213,7 @@ private fun BookmarkListItemMenu(
		MenuItem.TextItem(
		text = Text.Resource(R.string.bookmark_menu_open_in_new_tab_button),
		onClick = { store.dispatch(BookmarksListMenuAction.Bookmark.OpenInNormalTabClicked(bookmark)) },
		),
		).takeIf { !LocalContext.current.components.settings.shouldDisableNormalMode },
		MenuItem.TextItem(
		text = Text.Resource(R.string.bookmark_menu_open_in_private_tab_button),
		onClick = { store.dispatch(BookmarksListMenuAction.Bookmark.OpenInPrivateTabClicked(bookmark)) },
		@@ -1236,7 +1238,7 @@ private fun BookmarkListFolderMenu(
		folder: BookmarkItem.Folder,
		store: BookmarksStore,
		) {
		val menuItems = listOf(
		val menuItems = listOfNotNull(
		MenuItem.TextItem(
		text = Text.Resource(R.string.bookmark_menu_select_button),
		onClick = { store.dispatch(BookmarksListMenuAction.Folder.SelectClicked(folder)) },
		@@ -1254,7 +1256,7 @@ private fun BookmarkListFolderMenu(
		MenuItem.TextItem(
		text = Text.Resource(R.string.bookmark_menu_open_all_in_tabs_button),
		onClick = { store.dispatch(BookmarksListMenuAction.Folder.OpenAllInNormalTabClicked(folder)) },
		),
		).takeIf { !LocalContext.current.components.settings.shouldDisableNormalMode },
		MenuItem.TextItem(
		text = Text.Resource(R.string.bookmark_menu_open_all_in_private_tabs_button),
		onClick = { store.dispatch(BookmarksListMenuAction.Folder.OpenAllInPrivateTabClicked(folder)) },

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/browsingmode/BrowsingModeManager.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,10 @@ class DefaultBrowsingModeManager(
		* Returns the [BrowsingMode] set by the [intent] or the last known [BrowsingMode].
		*/
		private fun getModeFromIntentOrLastKnown(intent: Intent?): BrowsingMode {
		if (settings.shouldDisableNormalMode) {
		return BrowsingMode.Private
		}

		intent?.toSafeIntent()?.let {
		if (it.hasExtra(PRIVATE_BROWSING_MODE)) {
		val startPrivateMode = it.getBooleanExtra(PRIVATE_BROWSING_MODE, false)

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/search/ApplicationSearchMiddleware.kt

+4 −3

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ import mozilla.components.browser.state.state.BrowserState
		import mozilla.components.feature.search.ext.createApplicationSearchEngine
		import mozilla.components.lib.state.Middleware
		import mozilla.components.lib.state.Store
		import org.mozilla.fenix.ext.components
		import org.mozilla.fenix.R
		import mozilla.components.ui.icons.R as iconsR

		@@ -34,7 +35,7 @@ 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),
		@@ -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(iconsR.drawable.mozac_ic_history_24),
		),
		).takeIf { !context.components.settings.shouldDisableNormalMode },
		)

		store.dispatch(SearchAction.ApplicationSearchEnginesLoaded(searchEngines))

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/HttpsOnlyFragment.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ import android.view.ViewGroup
		import androidx.core.text.HtmlCompat
		import androidx.core.text.getSpans
		import androidx.core.view.children
		import androidx.core.view.isGone
		import androidx.fragment.app.Fragment
		import androidx.navigation.fragment.findNavController
		import org.mozilla.fenix.R
		@@ -61,6 +62,8 @@ class HttpsOnlyFragment : Fragment(), SystemInsetsPaddedFragment {
		updateEngineHttpsOnlyMode()
		}

		binding.httpsOnlyModes.isGone = requireContext().components.settings.shouldDisableNormalMode

		return binding.root
		}

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt

+9 −3

Original line number	Diff line number	Diff line
		@@ -313,10 +313,16 @@ class SettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragment
		} else {
		getString(R.string.delete_browsing_data_quit_off)
		}
		// Hide "Delete browsing data on quit" when in Private Browsing-only mode
		deleteBrowsingDataPreference.isVisible =
		!deleteBrowsingDataPreference.context.components.settings.shouldDisableNormalMode


		if (!settings.shouldDisableNormalMode) {
		val tabSettingsPreference =
		requirePreference<Preference>(R.string.pref_key_tabs)
		tabSettingsPreference.summary = settings.getTabTimeoutString()
		tabSettingsPreference.summary = context?.components?.settings?.getTabTimeoutString()
		}

		// val autofillPreference = requirePreference<Preference>(R.string.pref_key_credit_cards)
		// autofillPreference.title = if (settings.addressFeature) {