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

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

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1158,11 +1158,16 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
	internal fun getModeFromIntentOrLastKnown(intent: Intent?): BrowsingMode {		internal fun getModeFromIntentOrLastKnown(intent: Intent?): BrowsingMode {
	intent?.toSafeIntent()?.let {		intent?.toSafeIntent()?.let {
	if (it.hasExtra(PRIVATE_BROWSING_MODE)) {		if (it.hasExtra(PRIVATE_BROWSING_MODE)) {
	val startPrivateMode = it.getBooleanExtra(PRIVATE_BROWSING_MODE, false)		val startPrivateMode = settings().shouldDisableNormalMode \|\|
			it.getBooleanExtra(PRIVATE_BROWSING_MODE, settings().openLinksInAPrivateTab)
	return BrowsingMode.fromBoolean(isPrivate = startPrivateMode)		return BrowsingMode.fromBoolean(isPrivate = startPrivateMode)
	}		}
	}		}
	return settings().lastKnownMode		return when {
			settings().shouldDisableNormalMode -> BrowsingMode.Private
			settings().openLinksInAPrivateTab -> BrowsingMode.Private
			else -> settings().lastKnownMode
			}
	}		}

	/**		/**

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -436,7 +436,7 @@ open class DefaultToolbarMenu(
	newTabItem,		newTabItem,
	BrowserMenuDivider(),		BrowserMenuDivider(),
	bookmarksItem,		bookmarksItem,
	historyItem,		if (context.settings().shouldDisableNormalMode) null else historyItem,
	downloadsItem,		downloadsItem,
	passwordsItem,		passwordsItem,
	extensionsItem,		extensionsItem,

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ import androidx.compose.ui.viewinterop.AndroidView
	import androidx.coordinatorlayout.widget.CoordinatorLayout		import androidx.coordinatorlayout.widget.CoordinatorLayout
	import androidx.core.content.ContextCompat.getColor		import androidx.core.content.ContextCompat.getColor
	import androidx.core.graphics.drawable.toDrawable		import androidx.core.graphics.drawable.toDrawable
			import androidx.core.view.isGone
	import androidx.core.view.isVisible		import androidx.core.view.isVisible
	import androidx.fragment.app.Fragment		import androidx.fragment.app.Fragment
	import androidx.fragment.app.activityViewModels		import androidx.fragment.app.activityViewModels
	@@ -871,6 +872,8 @@ class HomeFragment : Fragment() {
	Homepage.privateModeIconTapped.record(mozilla.telemetry.glean.private.NoExtras())		Homepage.privateModeIconTapped.record(mozilla.telemetry.glean.private.NoExtras())
	}		}

			binding.privateBrowsingButton.isGone = view.context.settings().shouldDisableNormalMode

	consumeFrom(requireComponents.core.store) {		consumeFrom(requireComponents.core.store) {
	toolbarView.updateTabCounter(it)		toolbarView.updateTabCounter(it)
	showCollectionsPlaceholder(it)		showCollectionsPlaceholder(it)

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -353,6 +353,10 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
	} else {		} else {
	inflater.inflate(R.menu.bookmarks_select_multi, menu)		inflater.inflate(R.menu.bookmarks_select_multi, menu)

			menu.findItem(R.id.open_bookmarks_in_new_tabs_multi_select)?.apply {
			isVisible = !requireContext().settings().shouldDisableNormalMode
			}

	menu.findItem(R.id.delete_bookmarks_multi_select).title =		menu.findItem(R.id.delete_bookmarks_multi_select).title =
	SpannableString(getString(R.string.bookmark_menu_delete_button)).apply {		SpannableString(getString(R.string.bookmark_menu_delete_button)).apply {
	setTextColor(requireContext(), R.attr.textCritical)		setTextColor(requireContext(), R.attr.textCritical)

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

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,7 @@ import mozilla.components.concept.storage.BookmarkNodeType
	import mozilla.components.concept.storage.BookmarksStorage		import mozilla.components.concept.storage.BookmarksStorage
	import mozilla.components.support.ktx.android.content.getColorFromAttr		import mozilla.components.support.ktx.android.content.getColorFromAttr
	import org.mozilla.fenix.R		import org.mozilla.fenix.R
			import org.mozilla.fenix.ext.settings

	class BookmarkItemMenu(		class BookmarkItemMenu(
	private val context: Context,		private val context: Context,
	@@ -36,6 +37,8 @@ class BookmarkItemMenu(

	@VisibleForTesting		@VisibleForTesting
	internal suspend fun menuItems(itemType: BookmarkNodeType, itemId: String): List<TextMenuCandidate> {		internal suspend fun menuItems(itemType: BookmarkNodeType, itemId: String): List<TextMenuCandidate> {
			val shouldDisableNormalMode = context.settings().shouldDisableNormalMode

	val editMenuOption =		val editMenuOption =
	TextMenuCandidate(text = context.getString(R.string.bookmark_menu_edit_button)) {		TextMenuCandidate(text = context.getString(R.string.bookmark_menu_edit_button)) {
	onItemTapped?.invoke(Item.Edit)		onItemTapped?.invoke(Item.Edit)
	@@ -86,12 +89,16 @@ class BookmarkItemMenu(
	if (itemType == BookmarkNodeType.ITEM) {		if (itemType == BookmarkNodeType.ITEM) {
	add(copyMenuOption)		add(copyMenuOption)
	add(shareMenuOption)		add(shareMenuOption)
			if (!shouldDisableNormalMode) {
	add(openInNewTabMenuOption)		add(openInNewTabMenuOption)
			}
	add(openInPrivateTabMenuOption)		add(openInPrivateTabMenuOption)
	}		}

	if (itemType == BookmarkNodeType.FOLDER && checkAtLeastOneChild(itemId)) {		if (itemType == BookmarkNodeType.FOLDER && checkAtLeastOneChild(itemId)) {
			if (!shouldDisableNormalMode) {
	add(openAllInNewTabsMenuOption)		add(openAllInNewTabsMenuOption)
			}
	add(openAllInPrivateTabsMenuOption)		add(openAllInPrivateTabsMenuOption)
	}		}