- tbb-commits - lists.torproject.org

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40058: Hide option for disallowing addon in private mode
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: 7097a8cf by Alex Catarineu at 2020-10-01T18:24:16+02:00 Bug 40058: Hide option for disallowing addon in private mode - - - - - ee0aa802 by Matthew Finkel at 2020-10-01T18:03:05+00:00 Merge remote-tracking branch 'acatgl/40058' into tor-browser-81.1.1-10.0-1 - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt ===================================== @@ -230,7 +230,7 @@ class InstalledAddonDetailsFragment : Fragment() { private fun bindAllowInPrivateBrowsingSwitch(view: View) { val switch = view.allow_in_private_browsing_switch switch.isChecked = addon.isAllowedInPrivateBrowsing() - switch.isVisible = addon.isEnabled() + switch.isVisible = false switch.setOnCheckedChangeListener { v, isChecked -> val addonManager = v.context.components.addonManager switch.isClickable = false View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/f22fa2b557f5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/f22fa2b557f5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-57.0.6-10.0-2] 2 commits: Bug 40011: Hide option for disallowing addons in private mode
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components Commits: f7f89b0b by Alex Catarineu at 2020-10-01T18:31:11+02:00 Bug 40011: Hide option for disallowing addons in private mode - - - - - 8de106ba by Matthew Finkel at 2020-10-01T18:01:21+00:00 Merge remote-tracking branch 'acatgl/40011' into android-components-57.0.6-10.0-2 - - - - - 2 changed files: - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - samples/browser/src/main/res/layout/activity_installed_add_on_details.xml Changes: ===================================== components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml ===================================== @@ -63,6 +63,7 @@ /> <androidx.appcompat.widget.AppCompatCheckBox + android:visibility="gone" android:id="@+id/allow_in_private_browsing" android:layout_width="wrap_content" android:layout_height="wrap_content" ===================================== samples/browser/src/main/res/layout/activity_installed_add_on_details.xml ===================================== @@ -70,6 +70,7 @@ app:drawableStartCompat="@drawable/mozac_ic_permissions" /> <Switch + android:visibility="gone" android:id="@+id/allow_in_private_browsing_switch" android:layout_width="match_parent" android:layout_height="wrap_content" View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40061: Do not show "Send to device" in sharing menu
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: ab9ca18c by Alex Catarineu at 2020-10-01T17:55:47+02:00 Bug 40061: Do not show "Send to device" in sharing menu - - - - - f22fa2b5 by Matthew Finkel at 2020-10-01T16:24:50+00:00 Merge remote-tracking branch 'acatgl/40061' into tor-browser-81.1.1-10.0-1 - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt ===================================== @@ -35,7 +35,6 @@ class ShareFragment : AppCompatDialogFragment() { } private lateinit var shareInteractor: ShareInteractor private lateinit var shareCloseView: ShareCloseView - private lateinit var shareToAccountDevicesView: ShareToAccountDevicesView private lateinit var shareToAppsView: ShareToAppsView override fun onAttach(context: Context) { @@ -90,9 +89,6 @@ class ShareFragment : AppCompatDialogFragment() { ) view.shareWrapper.setOnClickListener { shareInteractor.onShareClosed() } - shareToAccountDevicesView = - ShareToAccountDevicesView(view.devicesShareLayout, shareInteractor) - if (args.showPage) { // Show the previous fragment underneath the share background scrim // by making it translucent. @@ -111,9 +107,6 @@ class ShareFragment : AppCompatDialogFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - viewModel.devicesList.observe(viewLifecycleOwner) { devicesShareOptions -> - shareToAccountDevicesView.setShareTargets(devicesShareOptions) - } viewModel.appsList.observe(viewLifecycleOwner) { appsToShareTo -> shareToAppsView.setShareTargets(appsToShareTo) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/1087d1efd878… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/1087d1efd878… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40064: Use Gecko Beta for Nightly and Debug variants
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: b4d5b61e by Matthew Finkel at 2020-09-30T22:12:23+00:00 Bug 40064: Use Gecko Beta for Nightly and Debug variants - - - - - 1087d1ef by Matthew Finkel at 2020-10-01T15:48:58+00:00 Merge branch 'bug_40064_00' into tor-browser-81.1.1-10.0-1 - - - - - 1 changed file: - app/build.gradle Changes: ===================================== app/build.gradle ===================================== @@ -327,9 +327,9 @@ ext.gleanDocsDirectory = "$rootDir/docs" apply plugin: "org.mozilla.telemetry.glean-gradle-plugin" dependencies { - debugImplementation Deps.mozilla_browser_engine_gecko_nightly + debugImplementation Deps.mozilla_browser_engine_gecko_beta - nightlyImplementation Deps.mozilla_browser_engine_gecko_nightly + nightlyImplementation Deps.mozilla_browser_engine_gecko_beta betaImplementation Deps.mozilla_browser_engine_gecko_beta releaseImplementation Deps.mozilla_browser_engine_gecko_release View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/d7f419b356f4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/d7f419b356f4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 5 commits: fixup! Bug 40028: Implement Tor Onboarding
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: dbb92015 by Matthew Finkel at 2020-09-30T18:34:52+00:00 fixup! Bug 40028: Implement Tor Onboarding - - - - - dcb56537 by Matthew Finkel at 2020-09-30T21:15:09+00:00 Bug 40026: Implement Security Level settings - - - - - 0f1c4980 by Matthew Finkel at 2020-09-30T21:15:09+00:00 Bug 40026: Integrate Security Level settings - - - - - d54480c4 by Matthew Finkel at 2020-10-01T15:45:22+00:00 fixup! Bug 34378: Port external helper app prompting - - - - - d7f419b3 by Matthew Finkel at 2020-10-01T15:47:50+00:00 Merge branch 'bug_40026_06' into tor-browser-81.1.1-10.0-1 - - - - - 12 changed files: - app/src/main/java/org/mozilla/fenix/HomeActivity.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt - app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - + app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt - + app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt - app/src/main/res/layout/tor_onboarding_security_level.xml - app/src/main/res/navigation/nav_graph.xml - app/src/main/res/values/preference_keys.xml - app/src/main/res/values/torbrowser_strings.xml - app/src/main/res/xml/preferences.xml - + app/src/main/res/xml/tor_security_level_preferences.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -416,6 +416,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { if (startIntent.creatorPackage == applicationContext.packageName) { val dialog = getOrCreateDialog() dialog.onConfirmRedirect = { + @Suppress("EmptyCatchBlock") try { startIntent.send() } catch (error: PendingIntent.CanceledException) { ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt ===================================== @@ -367,6 +367,8 @@ class DefaultSessionControlController( } override fun handleOpenSecurityLevelSettingsClicked() { + val directions = HomeFragmentDirections.actionGlobalTorSecurityLevelFragment() + navController.nav(R.id.homeFragment, directions) } override fun handleWhatsNewGetAnswersClicked() { ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt ===================================== @@ -8,8 +8,11 @@ import android.view.View import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.tor_onboarding_security_level.view.* import org.mozilla.fenix.R +import org.mozilla.fenix.ext.components import org.mozilla.fenix.home.sessioncontrol.OnboardingInteractor import org.mozilla.fenix.onboarding.OnboardingRadioButton +import org.mozilla.fenix.tor.SecurityLevel +import org.mozilla.fenix.tor.SecurityLevelUtil import org.mozilla.fenix.utils.view.addToRadioGroup class TorOnboardingSecurityLevelViewHolder( @@ -24,7 +27,7 @@ class TorOnboardingSecurityLevelViewHolder( init { view.header_text.setOnboardingIcon(R.drawable.ic_onboarding_tracking_protection) - standardSecurityLevel = view.security_level_standard_default + standardSecurityLevel = view.security_level_standard_option saferSecurityLevel = view.security_level_safer_option safestSecurityLevel = view.security_level_safest_option @@ -33,34 +36,45 @@ class TorOnboardingSecurityLevelViewHolder( ) view.open_settings_button.setOnClickListener { - interactor.onOpenSettingsClicked() + interactor.onOpenSecurityLevelSettingsClicked() } - setupRadioGroup() + setupRadioGroup(view) } - private fun setupRadioGroup() { + private fun setupRadioGroup(view: View) { addToRadioGroup(standardSecurityLevel, saferSecurityLevel, safestSecurityLevel) - standardSecurityLevel.isChecked = true - safestSecurityLevel.isChecked = false - saferSecurityLevel.isChecked = false + val securityLevel = try { + SecurityLevelUtil.getSecurityLevelFromInt( + view.context.components.core.engine.settings.torSecurityLevel + ) + } catch (e: IllegalStateException) { + SecurityLevel.STANDARD + } + + standardSecurityLevel.isChecked = securityLevel == SecurityLevel.STANDARD + safestSecurityLevel.isChecked = securityLevel == SecurityLevel.SAFEST + saferSecurityLevel.isChecked = securityLevel == SecurityLevel.SAFER standardSecurityLevel.onClickListener { - updateSecurityLevel() + updateSecurityLevel(SecurityLevel.STANDARD) } saferSecurityLevel.onClickListener { - updateSecurityLevel() + updateSecurityLevel(SecurityLevel.SAFER) } safestSecurityLevel.onClickListener { - updateSecurityLevel() + updateSecurityLevel(SecurityLevel.SAFEST) } } - private fun updateSecurityLevel() { + private fun updateSecurityLevel(newLevel: SecurityLevel) { + itemView.context.components.let { + it.core.engine.settings.torSecurityLevel = newLevel.intRepresentation + } } companion object { ===================================== app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -217,6 +217,9 @@ class SettingsFragment : PreferenceFragmentCompat() { resources.getString(R.string.pref_key_tor_network_settings) -> { SettingsFragmentDirections.actionSettingsFragmentToTorNetworkSettingsFragment() } + resources.getString(R.string.pref_key_tor_security_level_settings) -> { + SettingsFragmentDirections.actionSettingsFragmentToTorSecurityLevelFragment() + } resources.getString(R.string.pref_key_tracking_protection_settings) -> { requireContext().metrics.track(Event.TrackingProtectionSettings) SettingsFragmentDirections.actionSettingsFragmentToTrackingProtectionFragment() ===================================== app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt ===================================== @@ -0,0 +1,86 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.settings + +import android.os.Bundle +import androidx.preference.PreferenceFragmentCompat +import org.mozilla.fenix.R +import org.mozilla.fenix.ext.components +import org.mozilla.fenix.ext.settings +import org.mozilla.fenix.ext.showToolbar +import org.mozilla.fenix.tor.SecurityLevel +import org.mozilla.fenix.tor.SecurityLevelUtil +import org.mozilla.fenix.utils.view.GroupableRadioButton +import org.mozilla.fenix.utils.view.addToRadioGroup +import org.mozilla.fenix.utils.view.uncheckAll + +/** + * Lets the user choose their security level + */ +@Suppress("SpreadOperator") +class TorSecurityLevelFragment : PreferenceFragmentCompat() { + private val securityLevelRadioGroups = mutableListOf<GroupableRadioButton>() + private var previousSecurityLevel: SecurityLevel? = null + + override fun onResume() { + super.onResume() + showToolbar(getString(R.string.preferences_tor_security_level_options)) + } + + override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { + setPreferencesFromResource(R.xml.tor_security_level_preferences, rootKey) + + val currentLevel: SecurityLevel? = context?.components?.let { + try { + SecurityLevelUtil.getSecurityLevelFromInt( + it.core.engine.settings.torSecurityLevel + ) + } catch (e: IllegalStateException) { + // The default state is 0. If we get an invalid state then + // default to Standard (4). + SecurityLevel.STANDARD + } + } + + if (currentLevel == null) { + throw IllegalStateException("context or Components is null.") + } + + val radioSafer = bindSecurityLevelRadio(SecurityLevel.SAFER) + val radioSafest = bindSecurityLevelRadio(SecurityLevel.SAFEST) + val radioStandard = bindSecurityLevelRadio(SecurityLevel.STANDARD) + + securityLevelRadioGroups.addAll(mutableListOf(radioSafer, radioSafest, radioStandard)) + // `*` is Kotlin's "spread" operator, for expanding an Array as a vararg. + addToRadioGroup(*securityLevelRadioGroups.toTypedArray()) + + securityLevelRadioGroups.uncheckAll() + val securityLevelRadioButton = requirePreference<RadioButtonPreference>(currentLevel.preferenceKey) + // Cache this for later comparison in the OnPreferenceChangeListener + previousSecurityLevel = currentLevel + securityLevelRadioButton.setCheckedWithoutClickListener(true) + } + + private fun bindSecurityLevelRadio( + level: SecurityLevel + ): RadioButtonPreference { + val radio = requirePreference<RadioButtonPreference>(level.preferenceKey) + + radio.summary = getString(level.contentDescriptionRes) + + radio.apply { + setOnPreferenceChangeListener<Boolean> { preference, isChecked -> + if (isChecked && (previousSecurityLevel!! != level)) { + preference.context.components.core.engine.settings.torSecurityLevel = + level.intRepresentation + previousSecurityLevel = level + } + true + } + } + + return radio + } +} ===================================== app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt ===================================== @@ -0,0 +1,51 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor + +import android.os.Parcelable +import androidx.annotation.StringRes +import kotlinx.android.parcel.Parcelize +import org.mozilla.fenix.R + +@Parcelize +enum class SecurityLevel( + @StringRes val preferenceKey: Int, + @StringRes val contentDescriptionRes: Int, + val intRepresentation: Int +) : Parcelable { + + STANDARD( + preferenceKey = R.string.pref_key_tor_security_level_standard_option, + contentDescriptionRes = R.string.tor_security_level_standard_description, + intRepresentation = SecurityLevel.SECURITY_LEVEL_STANDARD + ), + SAFER( + preferenceKey = R.string.pref_key_tor_security_level_safer_option, + contentDescriptionRes = R.string.tor_security_level_safer_description, + intRepresentation = SecurityLevel.SECURITY_LEVEL_SAFER + ), + SAFEST( + preferenceKey = R.string.pref_key_tor_security_level_safest_option, + contentDescriptionRes = R.string.tor_security_level_safest_description, + intRepresentation = SecurityLevel.SECURITY_LEVEL_SAFEST + ); + + companion object { + const val SECURITY_LEVEL_STANDARD = 4 + const val SECURITY_LEVEL_SAFER = 2 + const val SECURITY_LEVEL_SAFEST = 1 + } +} + +object SecurityLevelUtil { + fun getSecurityLevelFromInt(level: Int): SecurityLevel { + return when (level) { + SecurityLevel.SECURITY_LEVEL_STANDARD -> SecurityLevel.STANDARD + SecurityLevel.SECURITY_LEVEL_SAFER -> SecurityLevel.SAFER + SecurityLevel.SECURITY_LEVEL_SAFEST -> SecurityLevel.SAFEST + else -> throw IllegalStateException("Security Level $level is not valid") + } + } +} ===================================== app/src/main/res/layout/tor_onboarding_security_level.xml ===================================== @@ -37,7 +37,7 @@ <org.mozilla.fenix.onboarding.OnboardingRadioButton - android:id="@+id/security_level_standard_default" + android:id="@+id/security_level_standard_option" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" @@ -52,9 +52,9 @@ android:theme="@style/Checkable.Colored" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/description_text" - app:onboardingKey="@string/pref_key_tor_security_level_standard_default" - app:onboardingKeyDescription="@string/tor_onboarding_security_level_standard_button_description" - app:onboardingKeyTitle="@string/tor_onboarding_security_level_standard_option" + app:onboardingKey="@string/pref_key_tor_security_level_standard_option" + app:onboardingKeyDescription="@string/tor_security_level_standard_description" + app:onboardingKeyTitle="@string/tor_security_level_standard_option" tools:text="Standard" /> <org.mozilla.fenix.onboarding.OnboardingRadioButton @@ -73,10 +73,10 @@ android:textColor="@color/primary_state_list_text_color" android:theme="@style/Checkable.Colored" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/security_level_standard_default" + app:layout_constraintTop_toBottomOf="@id/security_level_standard_option" app:onboardingKey="@string/pref_key_tor_security_level_safer_option" - app:onboardingKeyDescription="@string/tor_onboarding_security_level_safer_button_description" - app:onboardingKeyTitle="@string/tor_onboarding_security_level_safer_option" + app:onboardingKeyDescription="@string/tor_security_level_safer_description" + app:onboardingKeyTitle="@string/tor_security_level_safer_option" tools:text="Safer" /> <org.mozilla.fenix.onboarding.OnboardingRadioButton @@ -97,8 +97,8 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/security_level_safer_option" app:onboardingKey="@string/pref_key_tor_security_level_safest_option" - app:onboardingKeyDescription="@string/tor_onboarding_security_level_safest_button_description" - app:onboardingKeyTitle="@string/tor_onboarding_security_level_safest_option" + app:onboardingKeyDescription="@string/tor_security_level_safest_description" + app:onboardingKeyTitle="@string/tor_security_level_safest_option" tools:text="Safest" /> <Button ===================================== app/src/main/res/navigation/nav_graph.xml ===================================== @@ -58,6 +58,9 @@ <action android:id="@+id/action_global_syncedTabsFragment" app:destination="@id/syncedTabsFragment" /> + <action + android:id="@+id/action_global_torSecurityLevelFragment" + app:destination="@id/torSecurityLevelFragment" /> <action android:id="@+id/action_global_privateBrowsingFragment" app:destination="@id/privateBrowsingFragment" /> @@ -496,6 +499,13 @@ app:exitAnim="@anim/slide_out_left" app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" /> + <action + android:id="@+id/action_settingsFragment_to_torSecurityLevelFragment" + app:destination="@id/torSecurityLevelFragment" + app:enterAnim="@anim/slide_in_right" + app:exitAnim="@anim/slide_out_left" + app:popEnterAnim="@anim/slide_in_left" + app:popExitAnim="@anim/slide_out_right" /> <action android:id="@+id/action_settingsFragment_to_privateBrowsingFragment" app:destination="@id/privateBrowsingFragment" @@ -655,6 +665,10 @@ android:id="@+id/customizationFragment" android:name="org.mozilla.fenix.settings.CustomizationFragment" android:label="@string/preferences_customize" /> + <fragment + android:id="@+id/torSecurityLevelFragment" + android:name="org.mozilla.fenix.settings.TorSecurityLevelFragment" + android:label="@string/preferences_tor_security_level_settings" /> <fragment android:id="@+id/privateBrowsingFragment" android:name="org.mozilla.fenix.settings.PrivateBrowsingFragment" ===================================== app/src/main/res/values/preference_keys.xml ===================================== @@ -223,10 +223,10 @@ <string name="pref_key_noscript_installed" translatable="false">pref_key_noscript_installed</string>  - <string name="pref_key_tor_security_level_standard_default" translatable="false">pref_key_tor_security_level_standard_default</string> + <string name="pref_key_tor_security_level_settings" translatable="false">pref_key_tor_security_level_settings</string> + <string name="pref_key_tor_security_level_standard_option" translatable="false">pref_key_tor_security_level_standard_option</string> <string name="pref_key_tor_security_level_safer_option" translatable="false">pref_key_tor_security_level_safer_option</string> <string name="pref_key_tor_security_level_safest_option" translatable="false">pref_key_tor_security_level_safest_option</string> - <string name="pref_key_tor_security_level_custom_option" translatable="false">pref_key_tor_security_level_custom_option</string> <string name="pref_key_tor_network_settings" translatable="false">pref_key_tor_network_settings</string> <string name="pref_key_tor_network_settings_explanation" translatable="false">pref_key_tor_network_settings_explanation</string> ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -20,12 +20,6 @@ <string name="tor_onboarding_security_level">Set your Security Level</string> <string name="tor_onboarding_security_level_description">Disable certain web features that can be used to attack you, and harm your security, anonymity, and privacy.</string> - <string name="tor_onboarding_security_level_standard_option">Standard</string> - <string name="tor_onboarding_security_level_standard_button_description">All Tor Browser and website features are enabled.</string> - <string name="tor_onboarding_security_level_safer_option">Safer</string> - <string name="tor_onboarding_security_level_safer_button_description">Disable website features that are often dangerous, causing some sites to lose functionality.</string> - <string name="tor_onboarding_security_level_safest_option">Safest</string> - <string name="tor_onboarding_security_level_safest_button_description">Only allow website features required for static sites and basic services. These changes affect images, media, and scripts.</string> <string name="tor_onboarding_security_settings_button">Open Security Settings</string> <string name="tor_onboarding_donate_header">Donate and keep Tor safe</string> <string name="tor_onboarding_donate_description">Tor is free to use because of donations from people like you.</string> @@ -59,4 +53,17 @@ <string name="preferences_tor_network_settings_connected">Connected</string> <string name="preferences_tor_network_settings_restarting">Restarting</string> <string name="preferences_tor_network_settings_bridges_enabled">Bridges are enabled: %s</string> + +  + <string name="preferences_tor_security_level_settings">Security Settings</string> + <string name="preferences_tor_security_level_options">Security Level</string> + +  + <string name="tor_security_level_standard_option">Standard</string> + <string name="tor_security_level_standard_description">All Tor Browser and website features are enabled.</string> + <string name="tor_security_level_safer_option">Safer</string> + <string name="tor_security_level_safer_description">Disable website features that are often dangerous, causing some sites to lose functionality.</string> + <string name="tor_security_level_safest_option">Safest</string> + <string name="tor_security_level_safest_description">Only allow website features required for static sites and basic services. These changes affect images, media, and scripts.</string> + </resources> ===================================== app/src/main/res/xml/preferences.xml ===================================== @@ -90,6 +90,11 @@ app:iconSpaceReserved="false" android:layout="@layout/preference_category_main_style"> + <androidx.preference.Preference + android:icon="@drawable/ic_tracking_protection_enabled" + android:key="@string/pref_key_tor_security_level_settings" + android:title="@string/preferences_tor_security_level_settings"/> + <androidx.preference.Preference android:icon="@drawable/ic_private_browsing" android:key="@string/pref_key_private_browsing" ===================================== app/src/main/res/xml/tor_security_level_preferences.xml ===================================== @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <org.mozilla.fenix.settings.RadioButtonPreference + android:defaultValue="true" + android:key="@string/pref_key_tor_security_level_standard_option" + android:summary="@string/tor_security_level_standard_description" + android:title="@string/tor_security_level_standard_option" /> + <org.mozilla.fenix.settings.RadioButtonPreference + android:defaultValue="false" + android:key="@string/pref_key_tor_security_level_safer_option" + android:summary="@string/tor_security_level_safer_description" + android:title="@string/tor_security_level_safer_option" /> + <org.mozilla.fenix.settings.RadioButtonPreference + android:defaultValue="false" + android:key="@string/pref_key_tor_security_level_safest_option" + android:summary="@string/tor_security_level_safest_description" + android:title="@string/tor_security_level_safest_option" /> +</androidx.preference.PreferenceScreen> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/74d5540329f4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/74d5540329f4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/89' into master
by gk＠torproject.org 01 Oct '20

01 Oct '20

commit 0f4e3794bed9b82b579710f9229c43614623d08e Merge: 56caff8 220b2bc Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 1 15:19:06 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/89' into master projects/fenix/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 40113: Build Fenix Nightly variant for nightly target
by gk＠torproject.org 01 Oct '20

01 Oct '20

commit 220b2bc905c5c8e054f367cf003cbd5fb70215c5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 30 22:14:03 2020 +0000 Bug 40113: Build Fenix Nightly variant for nightly target --- projects/fenix/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fenix/config b/projects/fenix/config index 1798e0d..a3d0b73 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -22,7 +22,7 @@ targets: nightly: git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 - variant: Beta + variant: Nightly input_files: - project: container-image

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Bug 40125: Expose Security Level pref in GeckoView
by sysrqb＠torproject.org 01 Oct '20

01 Oct '20

commit bacf200e1f5279121924b92a69fe5301e44572a6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 14 02:52:28 2020 +0000 Bug 40125: Expose Security Level pref in GeckoView --- mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index b6d974dda197..e5dec1ff09e9 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -577,6 +577,7 @@ package org.mozilla.geckoview { method @Nullable public GeckoRuntime getRuntime(); method @Nullable public Rect getScreenSizeOverride(); method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate(); + method public int getTorSecurityLevel(); method public boolean getUseMaxScreenDepth(); method @Deprecated public boolean getUseMultiprocess(); method public boolean getWebFontsEnabled(); @@ -595,6 +596,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings setLoginAutofillEnabled(boolean); method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int); method @NonNull public GeckoRuntimeSettings setRemoteDebuggingEnabled(boolean); + method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int); method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean); method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean); field public static final int COLOR_SCHEME_DARK = 1; @@ -630,6 +632,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings.Builder remoteDebuggingEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder screenSizeOverride(int, int); method @NonNull public GeckoRuntimeSettings.Builder telemetryDelegate(@NonNull RuntimeTelemetry.Delegate); + method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int); method @NonNull public GeckoRuntimeSettings.Builder useMaxScreenDepth(boolean); method @Deprecated @NonNull public GeckoRuntimeSettings.Builder useMultiprocess(boolean); method @NonNull public GeckoRuntimeSettings.Builder webFontsEnabled(boolean); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index 59ee4e9ca66e..84b58f4ead40 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -457,6 +457,17 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { getSettings().mForceUserScalable.set(flag); return this; } + + /** + * Set security level. + * + * @param level A value determining the security level. Default is 0. + * @return This Builder instance. + */ + public @NonNull Builder torSecurityLevel(final int level) { + getSettings().mTorSecurityLevel.set(level); + return this; + } } private GeckoRuntime mRuntime; @@ -507,6 +518,8 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { "browser.tabs.remote.autostart", true); /* package */ final Pref<Boolean> mAutofillLogins = new Pref<Boolean>( "signon.autofillForms", true); + /* package */ final Pref<Integer> mTorSecurityLevel = new Pref<>( + "extensions.torbutton.security_slider", 0); /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM; @@ -1157,6 +1170,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { return this; } + /** + * Gets the current security level. + * + * @return current security protection level + */ + public int getTorSecurityLevel() { + return mTorSecurityLevel.get(); + } + + /** + * Sets the Tor Security Level. + * + * @param level security protection level + * @return This GeckoRuntimeSettings instance. + */ + public @NonNull GeckoRuntimeSettings setTorSecurityLevel(final int level) { + mTorSecurityLevel.commit(level); + return this; + } + @Override // Parcelable public void writeToParcel(final Parcel out, final int flags) { super.writeToParcel(out, flags);

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Merge branch 'bug_40125_01' into tor-browser-81.0b9-10.0-1
by sysrqb＠torproject.org 01 Oct '20

01 Oct '20

commit 572a39faa22c285a856bb3ed6fc2d630ce465254 Merge: 9e380b2e1818 bacf200e1f52 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Oct 1 14:04:52 2020 +0000 Merge branch 'bug_40125_01' into tor-browser-81.0b9-10.0-1 mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+)

1 0

[Git][tpo/applications/android-components][android-components-57.0.6-10.0-2] 2 commits: Bug 40006: Expose Security Level interface
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components Commits: 25f1f7c1 by Matthew Finkel at 2020-09-30T21:52:48+00:00 Bug 40006: Expose Security Level interface - - - - - 6f338e43 by Matthew Finkel at 2020-10-01T14:02:33+00:00 Merge branch 'bug_40006_02' into android-components-57.0.6-10.0-2 - - - - - 3 changed files: - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt Changes: ===================================== components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt ===================================== @@ -615,6 +615,14 @@ class GeckoEngine( override var forceUserScalableContent: Boolean get() = runtime.settings.forceUserScalableEnabled set(value) { runtime.settings.forceUserScalableEnabled = value } + + override var torSecurityLevel: Int + get() = runtime.settings.torSecurityLevel + set(value) { + value.let { + runtime.settings.torSecurityLevel = it + } + } }.apply { defaultSettings?.let { this.javascriptEnabled = it.javascriptEnabled @@ -631,6 +639,7 @@ class GeckoEngine( this.fontSizeFactor = it.fontSizeFactor this.forceUserScalableContent = it.forceUserScalableContent this.loginAutofillEnabled = it.loginAutofillEnabled + this.torSecurityLevel = it.torSecurityLevel } } ===================================== components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt ===================================== @@ -615,6 +615,14 @@ class GeckoEngine( override var forceUserScalableContent: Boolean get() = runtime.settings.forceUserScalableEnabled set(value) { runtime.settings.forceUserScalableEnabled = value } + + override var torSecurityLevel: Int + get() = runtime.settings.torSecurityLevel + set(value) { + value.let { + runtime.settings.torSecurityLevel = it + } + } }.apply { defaultSettings?.let { this.javascriptEnabled = it.javascriptEnabled @@ -631,6 +639,7 @@ class GeckoEngine( this.fontSizeFactor = it.fontSizeFactor this.forceUserScalableContent = it.forceUserScalableContent this.loginAutofillEnabled = it.loginAutofillEnabled + this.torSecurityLevel = it.torSecurityLevel } } ===================================== components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt ===================================== @@ -174,6 +174,11 @@ abstract class Settings { * Setting to force the ability to scale the content */ open var forceUserScalableContent: Boolean by UnsupportedSetting() + + /** + * Setting to control the current security level + */ + open var torSecurityLevel: Int by UnsupportedSetting() } /** @@ -208,7 +213,8 @@ data class DefaultSettings( override var fontInflationEnabled: Boolean? = null, override var fontSizeFactor: Float? = null, override var forceUserScalableContent: Boolean = false, - override var loginAutofillEnabled: Boolean = false + override var loginAutofillEnabled: Boolean = false, + override var torSecurityLevel: Int = 0 ) : Settings() class UnsupportedSetting<T> { View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] fixup! Bug 40041: Implement Tor Network Settings
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: 74d55403 by Matthew Finkel at 2020-09-30T22:41:23+00:00 fixup! Bug 40041: Implement Tor Network Settings Bug 40066: Correct conditional statement for hiding snowflake - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt ===================================== @@ -42,7 +42,7 @@ class TorBridgeConfigFragment : PreferenceFragmentCompat() { addToRadioGroup(*builtinBridgeRadioGroups.toTypedArray()) // Snowflake is not available on Release at this time. - if (Config.channel.isReleased) { + if (Config.channel.isRelease) { radioSnowflake.apply { isVisible = false } View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/74d5540329f4a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/74d5540329f4a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40093: Ensure application-services libs do not include libc networking symbols
by gk＠torproject.org 01 Oct '20

01 Oct '20

commit 82ad6be56ef54a27da654d7ea879f8dff5fda900 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 15 16:18:36 2020 +0200 Bug 40093: Ensure application-services libs do not include libc networking symbols This compiles and links NSS/application-services with lto, and also adds a check which will make the building of the application-services project fail if it finds networking symbols in the final built libraries. --- projects/application-services/build | 13 +++++++++++++ projects/application-services/config | 2 ++ projects/application-services/lto.patch | 10 ++++++++++ projects/nss/build | 4 ++++ 4 files changed, 29 insertions(+) diff --git a/projects/application-services/build b/projects/application-services/build index 5c6b5e0..ffe63da 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -97,12 +97,25 @@ patch -p1 < $rootdir/1651662.patch export LANG=C.UTF-8 patch -p1 < $rootdir/mavenLocal.patch gradle_flags="--offline --no-daemon -Dmaven.repo.local=$gradle_repo" + patch -p1 < $rootdir/lto.patch + # Set the right flags for cross-language LTO and override linking opt level, since + # lld does not understand -Os or -Oz. + export RUSTFLAGS="-Clinker-plugin-lto -Clink-arg=-fuse-ld=lld -Clink-arg=-Wl,-plugin-opt=O2" $GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags assembleRelease $GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags publish cd build find maven -regex '.*[0-9].$aar\|pom$' -exec cp --parents {} $distdir \; + # Verify that the compiled libs do not have libc networking symbols + # (list adapted from https://searchfox.org/mozilla-central/rev/30e70f2fe80c97bfbfcd975e68538cefd…) + tmpdir=$(mktemp -d) + find $distdir -name '*.aar' -exec mkdir -p $tmpdir/{} \; -exec unzip {} -d $tmpdir/{} \; + if find $tmpdir -name '*.so' | xargs objdump -Tt | grep "*UND*" | grep "connect\|accept\|listen\|sock\|recv\|send\|host\|serv\|proto"; then + echo "Error: networking symbols found" + exit 1 + fi + cd /var/tmp/dist [% c('tar', { tar_src => [ project ], diff --git a/projects/application-services/config b/projects/application-services/config index 0560872..a002ae4 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -91,3 +91,5 @@ input_files: - filename: target.patch - filename: 1651660.patch - filename: 1651662.patch + - filename: lto.patch + enable: '[% !c("var/fetch_gradle_dependencies") %]' diff --git a/projects/application-services/lto.patch b/projects/application-services/lto.patch new file mode 100644 index 0000000..838967c --- /dev/null +++ b/projects/application-services/lto.patch @@ -0,0 +1,10 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 93006d8b..2c9ae848 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -39,4 +39,4 @@ members = [ + [profile.release] + opt-level = "s" + debug = true +-lto = "thin" ++lto = "fat" diff --git a/projects/nss/build b/projects/nss/build index c5cfd95..bf51122 100644 --- a/projects/nss/build +++ b/projects/nss/build @@ -52,6 +52,10 @@ patch -p2 < $rootdir/config.patch # side. patch -p2 < $rootdir/bug_13028.patch +# Enable LTO +export CFLAGS="-flto" +export LDFLAGS="-flto" + # Building NSPR mkdir $builddir/nspr_build cd $builddir/nspr_build

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/88' into master
by gk＠torproject.org 01 Oct '20

01 Oct '20

commit 56caff85ad2a4233227263060662275cd614a51b Merge: 07262d2 82ad6be Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 1 09:20:57 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/88' into master projects/application-services/build | 13 +++++++++++++ projects/application-services/config | 2 ++ projects/application-services/lto.patch | 10 ++++++++++ projects/nss/build | 4 ++++ 4 files changed, 29 insertions(+)

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: fixup! Bug 40028: Implement Tor Service controller
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: bf824c0f by Matthew Finkel at 2020-09-30T12:54:41+00:00 fixup! Bug 40028: Implement Tor Service controller Bug 40040: Try avoiding a race condition when starting Tor This does not prevent the race, but this increases the chances that the two racing operations do not happen in parallel. - - - - - 29abadbb by Matthew Finkel at 2020-09-30T22:03:40+00:00 Merge branch 'bug_40040_01' into tor-browser-81.1.1-10.0-1 - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/tor/TorController.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/tor/TorController.kt ===================================== @@ -119,6 +119,13 @@ class TorController( Prefs.setBridgesList(value) } + init { + // Bug 40040: Hacky: Initialize TorService when we are instantiated. This should + // help avoid a race condition involving copying assets and starting tor in TorService. + val torServiceStatus = Intent(context, TorService::class.java) + context.startService(torServiceStatus) + } + fun start() { // Register receiver lbm.registerReceiver( View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/294a617bf990… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/294a617bf990… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40106: Support using different geckoview series
by sysrqb＠torproject.org 30 Sep '20

30 Sep '20

commit 07262d2dbbbb645ba8f04ae94030276964b9a7bd Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 30 11:42:34 2020 +0000 Bug 40106: Support using different geckoview series We take the shortcut and just overwrite all the geckoview .aar files in our gradle-dependencies that are not breaking the build, which helps with fenix#40017, too. --- projects/android-components/build | 13 ++++++------- projects/fenix/build | 12 +++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/projects/android-components/build b/projects/android-components/build index 3cac44a..43016b0 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -8,9 +8,13 @@ mkdir /var/tmp/build [% IF !c("var/fetch_gradle_dependencies") %] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] - # XXX: Make this more generic and not only for geckoview-beta. - geckoview_version=$(find . -type f -name geckoview-beta-*.aar | cut -d \- -f 6 | cut -d \. -f 1-3) + tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %] + # This overwrites the release and beta geckoview .aar files in our + # gradle-dependencies directory to be sure that only the one we provide is + # getting used when building beta/release code. XXX: Find a way to make that + # work for nightly, too. + find $gradle_repo -type f $ -name geckoview-[^a-z]*.aar -o -name geckoview-beta*.aar $ -exec cp -f $distdir/geckoview/geckoview*.aar {} \; cp -r $gradle_repo/dl/android/maven2/* $gradle_repo cp -r $gradle_repo/maven2/* $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo @@ -18,7 +22,6 @@ mkdir /var/tmp/build # XXX: We could be smarter and just copy over the projects that are needed # according to the Gradle dependencies list. cp -rf $distdir/application-services/maven/org $gradle_repo - tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -38,10 +41,6 @@ patch -p1 < $rootdir/git.patch export LANG=C.UTF-8 patch -p1 < $rootdir/mavenLocal.patch - # Make sure our GeckoView dependency is used. XXX: Make this more generic and - # not only for geckoview-beta. - cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar - gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo" gradle $gradle_args assembleGeckoBeta -x lint diff --git a/projects/fenix/build b/projects/fenix/build index c9d7e22..0613b2f 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -12,9 +12,12 @@ EOF [% IF !c("var/fetch_gradle_dependencies") %] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] - # XXX: Make this more generic and not only for geckoview-beta. - geckoview_version=$(find . -type f -name geckoview-beta-*.aar | cut -d \- -f 6 | cut -d \. -f 1-3) + tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %] + # This overwrites the release, beta, and nightly geckoview .aar files in our + # gradle-dependencies directory to be sure that only the one we provide is + # getting used when building beta/release code. + find $gradle_repo -type f -name geckoview*.aar -exec cp -f $distdir/geckoview/geckoview*.aar {} \; cp -r $gradle_repo/dl/android/maven2/* $gradle_repo cp -r $gradle_repo/maven2/* $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo @@ -24,7 +27,6 @@ EOF cp -rf $distdir/application-services/maven/org $gradle_repo tar -C $distdir -xf [% c('input_files_by_name/android-components') %] cp -rf $distdir/android-components/maven/org $gradle_repo - tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -45,10 +47,6 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ export LANG=C.UTF-8 patch -p1 < $rootdir/mavenLocal.patch - # Make sure our GeckoView dependency is used. XXX: Make this more generic and - # not only for geckoview-beta. - cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar - eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]) if [ -z $MOZ_BUILD_DATE ] then

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40063: Do not sort search engines alphabetically
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: 04c2a951 by Alex Catarineu at 2020-09-30T19:48:53+02:00 Bug 40063: Do not sort search engines alphabetically - - - - - 294a617b by Matthew Finkel at 2020-09-30T21:36:52+00:00 Merge remote-tracking branch 'acatgl/40063' into tor-browser-81.1.1-10.0-1 - - - - - 2 changed files: - app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt - app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProvider.kt ===================================== @@ -26,7 +26,6 @@ import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.Config import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.settings -import java.util.Locale @SuppressWarnings("TooManyFunctions") open class FenixSearchEngineProvider( @@ -112,7 +111,7 @@ open class FenixSearchEngineProvider( engineList.copy( list = engineList.list.filter { installedIdentifiers.contains(it.identifier) - }.sortedBy { it.name.toLowerCase(Locale.getDefault()) }, + }, default = engineList.default?.let { if (installedIdentifiers.contains(it.identifier)) { it ===================================== app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt ===================================== @@ -32,7 +32,6 @@ import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.getRootView import org.mozilla.fenix.ext.settings import org.mozilla.fenix.utils.allowUndo -import java.util.Locale abstract class SearchEngineListPreference @JvmOverloads constructor( context: Context, @@ -116,7 +115,6 @@ abstract class SearchEngineListPreference @JvmOverloads constructor( searchEngineList.list .filter { it.identifier != searchEngineList.default?.identifier } - .sortedBy { it.name.toLowerCase(Locale.getDefault()) } .forEachIndexed(setupSearchEngineItem) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/c211ca85cb0d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/c211ca85cb0d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-57.0.6-10.0-2] 2 commits: Bug 40009: Change the default search engines
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components Commits: d451ae47 by Alex Catarineu at 2020-09-30T19:39:26+02:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. - - - - - b8ebf04f by Matthew Finkel at 2020-09-30T21:35:02+00:00 Merge remote-tracking branch 'acatgl/40009' into android-components-57.0.6-10.0-2 - - - - - 6 changed files: - components/browser/search/src/main/assets/search/list.json - + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml - components/browser/search/src/main/assets/searchplugins/ddg.xml - + components/browser/search/src/main/assets/searchplugins/startpage.xml - + components/browser/search/src/main/assets/searchplugins/yahoo.xml - + components/browser/search/src/main/assets/searchplugins/youtube.xml Changes: ===================================== components/browser/search/src/main/assets/search/list.json ===================================== @@ -1,842 +1,13 @@ { "default": { - "searchDefault": "Google", - "searchOrder": ["Google", "Bing"], + "searchDefault": "DuckDuckGo", + "searchOrder": ["DuckDuckGo", "YouTube", "Google", "DuckDuckGoOnion", "Startpage", "Twitter", "Wikipedia", "Yahoo"], "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "regionOverrides": { - "US": { - "google-b-m": "google-b-1-m" - } }, "locales": { - "ach": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia" - ] - } - }, - "an": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-an" - ] - } - }, - "ar": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ar" - ] - } - }, - "as": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-as" - ] - } - }, - "ast": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ast" - ] - } - }, - "az": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "azerdict", "wikipedia-az" - ] - } - }, - "be": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-be", "yandex.by" - ] - }, - "BY": { - "searchDefault": "Яндекс" - }, - "KZ": { - "searchDefault": "Яндекс" - }, - "RU": { - "searchDefault": "Яндекс" - }, - "TR": { - "searchDefault": "Яндекс" - } - }, - "bg": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "pazaruvaj", "wikipedia-bg" - ] - } - }, - "bn": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-bn" - ] - } - }, - "bn-BD": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-bn" - ] - } - }, - "bn-IN": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "rediff", "wikipedia-bn" - ] - } - }, - "br": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-br" - ] - } - }, - "bs": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-bs" - ] - } - }, - "ca": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-ca", "diec2" - ] - } - }, - "cak": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazondotcom", "ddg", "wikipedia-es" - ] - } - }, - "cs": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "heureka-cz", "mapy-cz", "seznam-cz", "wikipedia-cz" - ] - } - }, - "cy": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "wikipedia-cy" - ] - } - }, - "da": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "ddg", "wikipedia-da" - ] - } - }, - "de": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "ddg", "ecosia", "qwant", "wikipedia-de" - ] - } - }, - "dsb": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "ddg", "wikipedia-dsb" - ] - } - }, - "el": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "skroutz", "wikipedia-el" - ] - } - }, - "en-CA": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-ca", "ddg", "wikipedia" - ] - } - }, - "en-GB": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia" - ] - }, - "RU": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia", "yandex-en" - ] - } - }, - "en-US": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia" - ] - }, - "RU": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia", "yandex-en" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "amazon-ca", "amazon-au", "google-2018", "duckduckgo", "google" - ] - } - }, - "en-ZA": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia" - ] - } - }, - "eo": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "reta-vortaro", "wikipedia-eo" - ] - } - }, - "es-AR": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "mercadolibre-ar", "wikipedia-es" - ] - } - }, - "es-CL": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "drae", "mercadolibre-cl", "wikipedia-es" - ] - } - }, - "es-ES": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-es" - ] - } - }, - "es-MX": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "mercadolibre-mx", "wikipedia-es" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "amazon-mx" - ] - } - }, - "et": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "ddg", "wikipedia-et" - ] - } - }, - "eu": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "elebila", "wikipedia-eu" - ] - } - }, - "fa": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-fa" - ] - } - }, - "ff": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-fr", "ddg", "wikipedia-fr" - ] - } - }, - "fi": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazondotcom", "ddg", "wikipedia-fi" - ] - } - }, - "fr": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "qwant", "wikipedia-fr" - ] - } - }, - "fy-NL": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-fy-NL", "bolcom-fy-NL" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "amazon-nl" - ] - } - }, - "ga-IE": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "ddg", "tearma", "wikipedia-ga-IE" - ] - } - }, - "gd": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "faclair-beag", "wikipedia-gd" - ] - } - }, - "gl": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-gl" - ] - } - }, - "gn": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-gn" - ] - } - }, - "gu-IN": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-gu" - ] - } - }, - "he": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-he" - ] - } - }, - "hi-IN": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-hi" - ] - } - }, - "hr": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "wikipedia-hr" - ] - } - }, - "hsb": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "ddg", "wikipedia-hsb" - ] - } - }, - "hu": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "sztaki-en-hu", "vatera", "wikipedia-hu" - ] - } - }, - "hy-AM": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "list-am", "wikipedia-hy-AM" - ] - } - }, - "ia": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ia" - ] - } - }, - "id": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-id" - ] - } - }, - "is": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is" - ] - } - }, - "it": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-it" - ] - } - }, - "ja": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazon-jp", "bing", "ddg", "wikipedia-ja", "yahoo-jp" - ] - } - }, - "ka": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ka" - ] - } - }, - "kab": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-kab" - ] - } - }, - "kk": { - "default": { - "visibleDefaultEngines": [ - "yandex", "google-b-m", "bing", "ddg", "wikipedia-kk" - ] - }, - "KZ": { - "searchDefault": "Яндекс" - }, - "BY": { - "searchDefault": "Яндекс" - }, - "RU": { - "searchDefault": "Яндекс" - }, - "TR": { - "searchDefault": "Яндекс" - } - }, - "km": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-km" - ] - } - }, - "kn": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-kn", "wiktionary-kn" - ] - } - }, - "ko": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "danawa-kr", "daum-kr", "naver-kr" - ] - } - }, - "lij": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-it", "ddg", "wikipedia-lij" - ] - } - }, - "lo": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-lo" - ] - } - }, - "lt": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-lt" - ] - } - }, - "ltg": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "wikipedia-ltg" - ] - } - }, - "lv": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "salidzinilv", "sslv", "wikipedia-lv" - ] - } - }, - "mai": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-hi" - ] - } - }, - "meh": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es" - ] - } - }, - "mix": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es" - ] - } - }, - "ml": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-ml" - ] - } - }, - "mr": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "rediff", "wikipedia-mr" - ] - } - }, - "ms": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ms" - ] - } - }, - "my": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-my" - ] - } - }, - "nb-NO": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "gulesider-mobile-NO", "wikipedia-NO" - ] - } - }, - "ne-NP": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-ne" - ] - } - }, - "nl": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "bolcom-nl", "ddg", "wikipedia-nl" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "amazon-nl" - ] - } - }, - "nn-NO": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "gulesider-mobile-NO", "wikipedia-NN" - ] - } - }, - "oc": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-oc", "wiktionary-oc" - ] - } - }, - "or": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-or", "wiktionary-or" - ] - } - }, - "pa-IN": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-pa" - ] - } - }, - "pl": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-pl" - ] - } - }, - "pt-BR": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-pt" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "amazon-br" - ] - } - }, - "pt-PT": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-pt" - ] - } - }, - "rm": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "leo_ende_de", "pledarigrond", "wikipedia-rm" - ] - } - }, - "ro": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-ro" - ] - } - }, - "ru": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "yandex-ru", "wikipedia-ru" - ] - }, - "RU": { - "searchDefault": "Яндекс" - }, - "BY": { - "searchDefault": "Яндекс" - }, - "KZ": { - "searchDefault": "Яндекс" - }, - "TR": { - "searchDefault": "Яндекс" - } - }, - "sk": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "azet-sk", "slovnik-sk", "wikipedia-sk" - ] - } - }, - "sl": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "ceneje", "odpiralni", "wikipedia-sl" - ] - } - }, - "son": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "bing", "amazon-fr", "wikipedia-fr" - ] - } - }, - "sq": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "wikipedia-sq" - ] - } - }, - "sr": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-sr" - ] - } - }, - "sv-SE": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "prisjakt-sv-SE", "ddg", "wikipedia-sv-SE" - ] - } - }, - "ta": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-ta", "wiktionary-ta" - ] - } - }, - "te": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te" - ] - } - }, - "th": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-th" - ] - } - }, - "tl": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg" - ] - } - }, - "tr": { - "default": { - "visibleDefaultEngines": [ - "yandex-tr", "google-b-m", "ddg", "wikipedia-tr" - ] - }, - "TR": { - "searchDefault": "Yandex" - }, - "BY": { - "searchDefault": "Yandex" - }, - "KZ": { - "searchDefault": "Yandex" - }, - "RU": { - "searchDefault": "Yandex" - } - }, - "trs": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es" - ] - } - }, - "uk": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-uk", "hotline-ua" - ] - } - }, - "ur": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-ur" - ] - } - }, - "uz": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-uz" - ] - } - }, - "vi": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "coccoc", "ddg", "wikipedia-vi" - ] - } - }, - "wo": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-wo" - ] - } - }, - "xh": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia" - ] - } - }, - "zam": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-es" - ] - } - }, - "zh-CN": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "baidu", "bing", "ddg", "taobao", "wikipedia-zh-CN" - ] - }, - "CN": { - "searchDefault": "百度" - } - }, - "zh-TW": { - "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-zh-TW" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ - "duckduckgo" - ] - } - } } } ===================================== components/browser/search/src/main/assets/searchplugins/ddg-onion.xml ===================================== @@ -0,0 +1,11 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +<ShortName>DuckDuckGoOnion</ShortName> +<Description>Duck Duck Go Onion</Description> +<InputEncoding>UTF-8</InputEncoding> +<Image height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</Image> +<Url type="text/html" method="POST" template="https://3g2upl4pq6kufc4m.onion"> + <Param name="q" value="{searchTerms}"/> +</Url> +<SearchForm>https://3g2upl4pq6kufc4m.onion</SearchForm> +</SearchPlugin> + ===================================== components/browser/search/src/main/assets/searchplugins/ddg.xml ===================================== @@ -4,20 +4,11 @@ <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> <ShortName>DuckDuckGo</ShortName> +<Description>Duck Duck Go</Description> <InputEncoding>UTF-8</InputEncoding> <Image width="16" height="16">data:image/png;base64,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</Image> -<Url type="application/x-suggestions+json" method="GET" template="https://ac.duckduckgo.com/ac/"> +<Url type="text/html" method="POST" template="https://duckduckgo.com"> <Param name="q" value="{searchTerms}"/> - <Param name="type" value="list"/> -</Url> - -<Url type="text/html" method="GET" template="https://duckduckgo.com/"> - <Param name="q" value="{searchTerms}" /> - <Param name="t" value="fpas" /> -</Url> -<Url type="application/x-moz-tabletsearch" method="GET" template="https://duckduckgo.com/"> - <Param name="q" value="{searchTerms}" /> - <Param name="t" value="ftas" /> </Url> <SearchForm>https://duckduckgo.com</SearchForm> </SearchPlugin> ===================================== components/browser/search/src/main/assets/searchplugins/startpage.xml ===================================== @@ -0,0 +1,11 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +<ShortName>Startpage</ShortName> +<Description>Start Page</Description> +<InputEncoding>UTF-8</InputEncoding> +<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2jkj+9YtD/vWLQ/71i0P+9otD/vaLRP72i0T+9YtE/vWLRP72i0T+9otD/vaNRP72jUT+9otF/vaLRf73kkv+9Yc///WJP//1iT//9Yk///rAmf/94Mz/+sCa//aRTv/1iUH/9ok///aJP//2i0H/9otB//aJQv/2iUL/9otC//aNRP/2jUT/9o1E//aNRP/6wpv////////////96dr/95dQ//aNRP/2kET/9pBG//aQRv/2kEb/9pBG//aRR//3lEz/95BH//mueP/7xJ3/959g//efYf/4p23//vDm//3p2//3kEr/95FJ//aRSf/niFH/95FK//aRSv/2mE//95hS/vq4iP/////////////////81bj/95xZ//q4iP//////+bF+//eZT//njFT/PSqi/2xGjv/2mVD/951V/vedVv783cX///////vQrf/++PP///////748//+8uj///////m3gf/olFr/PSuj/w8Pt/9sSJD/951V//eeWf73oVv++8ul///////5sXf/+KRi//vRsf////////////3r3v/olF//Piyk/w8Pt/9sSJH/+J5Z//ieWv/3oV/++KZf/vihXP/97N7//vn0//zTs//6wJP/+bBy//q6iP/onW//Piyl/w8Pt/8fGbH/m2iB/+icY//4pGD/96hl/viqZf74pmD/+Kxr//3iy/////////n1//ivbP/onGj/Pi2m/w8Pt/8uJKz/fFeQ/x8Zsf8+Lqb/6J9r//ivbP74rm3++Klm//mpZv/5q2f/+bR9//m0e//poW7/Pi6n/w8Pt/9sTZj/+Ktp//ira/+rd4P/Dw+3/4xijv/5snH++LN1/vmvbf/5r23/+a5t//mvb//4r2//TTuk/w8Pt/8fGrL/6ah1//ivcP/4r3P/q3yI/w8Pt/+MZpP/+bN5/vm4ev75t3X/+bV1//m1df/5t3X/+Ld3/8qUhP98XZn/Hxqz/+mse//5t3f/2p+B/x8as/8PD7f/u4qK//m7fv76u4D++bl7//m3fP/5uXz/+bl8//m5fP/5t3z/+bl//x8as/9NPKf/fWCb/x8as/8PD7f/bVOh//q5f//6v4X++sGI/vm9g//5voX/+b6F//m9hf/6vYX/+r6F//nCh/+bepr/Hxu0/w8Pt/8PD7f/fWOh//q+hf/6wof/+saN/vrGjf75xIv/+ceL//nEi//5xIv/+sSL//rHi//6x43/+ceN/+m7kP+7lpj/6ruQ//rHkP/6x43/+seQ//rLlf76ypT++seR//rJkf/6yZH/+seR//rJkf/6yZH/+8mR//vJlP/7yZT/+smU//rJlP/6yZT/+8yV//rJlf/6zpn+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</Image> + +<Url type="text/html" method="POST" template="https://startpage.com/rto/search"> + <Param name="q" value="{searchTerms}"/> +</Url> +<SearchForm>https://startpage.com/rto/search/</SearchForm> +</SearchPlugin> ===================================== components/browser/search/src/main/assets/searchplugins/yahoo.xml ===================================== @@ -0,0 +1,22 @@ + + +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +<ShortName>Yahoo</ShortName> +<Description>Yahoo Search</Description> +<InputEncoding>UTF-8</InputEncoding> +<Image width="16" height="16">data:image/png;base64,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</Image> +<Url type="application/x-suggestions+json" method="GET" + template="https://search.yahoo.com/sugg/ff"> + <Param name="output" value="fxjson" /> + <Param name="appid" value="ffd" /> + <Param name="command" value="{searchTerms}" /> +</Url> +<Url type="text/html" method="GET" template="https://search.yahoo.com/yhs/search" + resultdomain="yahoo.com" rel="searchform"> + <Param name="p" value="{searchTerms}"/> + <Param name="ei" value="UTF-8"/> + <Param name="hspart" value="mozilla"/> +</Url> +</SearchPlugin> ===================================== components/browser/search/src/main/assets/searchplugins/youtube.xml ===================================== @@ -0,0 +1,10 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<ShortName>YouTube</ShortName> +<Description>YouTube - Videos</Description> +<InputEncoding>UTF-8</InputEncoding> +<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgNkQkIDZGiCA2RzAgNkcwIDZH/CA2R/wgNkf8IDZH/CA2R/wgNkf8IDZH/CA2R2AgNkcwIDZHMCA2RhAgNkQYIDpWHCA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpWHCQ6ZzAkOmf8JDpn/CQ6Z/wkOmf8JDpb/BQhc/wgMgf8JDpn/CQ6Z/wkOmf8JDpn/CQ6Z/wkOmf8JDpn/CQ6ZzAkOnuoJDp7/CQ6e/wkOnv8JDp7/Exed/8jIy/9RU4j/Bwp0/wkOm/8JDp7/CQ6e/wkOnv8JDp7/CQ6e/wkOnuoJD6T8CQ+k/wkPpP8JD6T/CQ+k/xUbo//V1dX/1dXV/4yNrP8QFG//CA6Y/wkPpP8JD6T/CQ+k/wkPpP8JD6T8CQ+q/wkPqv8JD6r/CQ+q/wkPqv8WG6n/3d3d/93d3f/d3d3/v7/M/y0wjv8JD6r/CQ+q/wkPqv8JD6r/CQ+q/woQr/8KEK//ChCv/woQr/8KEK//Fx2v/+fn5//n5+f/5+fn/+jo6P+YmtP/ChCv/woQr/8KEK//ChCv/woQr/8KELX8ChC1/woQtf8KELX/ChC1/xgdtf/x8fH/8fHx//Ly8v+bndv/Ehi3/woQtf8KELX/ChC1/woQtf8KELX8ChG76goRu/8KEbv/ChG7/woRu/8YH77/+fn5/+/v9/9fY9H/ChG7/woRu/8KEbv/ChG7/woRu/8KEbv/ChG76goRwMwKEcD/ChHA/woRwP8KEcD/EBfB/6Ol5/8tM8n/ChHA/woRwP8KEcD/ChHA/woRwP8KEcD/ChHA/woRwMwLEcSHCxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcSHCxLICQsSyKULEsjMCxLI+QsSyP8LEsj/CxLI/wsSyP8LEsj/CxLI/wsSyP8LEsj/CxLI0gsSyMwLEsiiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAD//wAA//8AAA==</Image> +<SearchForm>https://www.youtube.com/index</SearchForm> +<Url type="text/html" method="GET" template="https://www.youtube.com/results?search_query={searchTerms}&search=Search" resultDomain="youtube.com"> +</Url><Url type="application/x-suggestions+json" method="GET" template="https://suggestqueries.google.com/complete/search?output=firefox&ds=yt&…" resultDomain="suggestqueries.google.com"> +</Url> +</SearchPlugin> View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40060: Define versionName in Fenix build
by gk＠torproject.org 30 Sep '20

30 Sep '20

commit 46c2b00c782ad2f977125e9e3283c0944409a30e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 28 23:01:14 2020 +0000 Bug 40060: Define versionName in Fenix build In addition, we delete the hard-coded Fenix specific `version` and we use `abbrev`, instead. --- projects/fenix/build | 3 ++- projects/fenix/config | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/fenix/build b/projects/fenix/build index eedddcc..c9d7e22 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -56,7 +56,8 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ exit 1 fi - $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint + version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version") %]-[% c("variant") %])' + $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint # XXX We need the build variant in lower case. Do something smarter here. v=[% c("variant") %] cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %] diff --git a/projects/fenix/config b/projects/fenix/config index 171eb6b..1798e0d 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 10.0a6 +version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build1' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git @@ -22,7 +22,6 @@ targets: nightly: git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 - version: '[% c("abbrev") %]' variant: Beta input_files:

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 25 commits: fixup! Bug 40028: Implement Tor connect and logger screens
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: d404d769 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens Bug 40044: Fixup Connect screen - - - - - ab897368 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens Bug 40044: Fixup Connect screen Add settings cog - - - - - 50a2e757 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens - - - - - fc5c3aa6 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens - - - - - 091081a9 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor connect and logger screens - - - - - 2e5d5aed by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - f61219e9 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - e7c7cefc by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - 5d14717f by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - 3a96ef08 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment Move TorController's BroadcastReceiver registration into FenixApplication because TorController misses events when registration is controlled by HomeFragment. Initialize tor-android-service with FenixApplication's Context. - - - - - 90787eaa by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment - - - - - a66da2fc by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment - - - - - b26b2df1 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment - - - - - d01d44a7 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Rename localBroadcastReceiver as persistentBroadcastReceiver such that it isn't confused with the checkIsTorStarted receiver. - - - - - 0518acac by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Minor improvements - - - - - 0585f943 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Correct indentation and add restartTor() function - - - - - 1ad711c6 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Define enum class for tor's status and define current state using the enums. - - - - - 22b7ca55 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Add access/mutator for bridge information. - - - - - d62480a2 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller - - - - - dfc7234f by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Onboarding - - - - - 014c4b76 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Define bootstrapping events and Quick Start - - - - - b9f9c4b9 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40034: Disable PWA onboading - - - - - 1f8ead03 by Matthew Finkel at 2020-09-30T02:21:09+00:00 Bug 40041: Implement Tor Network Settings - - - - - 313a51e8 by Matthew Finkel at 2020-09-30T02:21:09+00:00 Bug 40041: Integrate Tor Network Settings - - - - - c211ca85 by Matthew Finkel at 2020-09-30T14:10:55+00:00 Merge branch 'bug_40041_09' into tor-browser-81.1.1-10.0-1 - - - - - 30 changed files: - app/src/main/java/org/mozilla/fenix/FenixApplication.kt - app/src/main/java/org/mozilla/fenix/HomeActivity.kt - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - app/src/main/java/org/mozilla/fenix/home/Mode.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapConnectViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapLoggerViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapPagerViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingDonateViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/torbootstrap/BootstrapPagerAdapter.kt - app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - + app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt - + app/src/main/java/org/mozilla/fenix/settings/TorNetworkSettingsFragment.kt - app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt - + app/src/main/java/org/mozilla/fenix/tor/TorBridgeTransports.kt - app/src/main/java/org/mozilla/fenix/tor/TorController.kt - app/src/main/java/org/mozilla/fenix/tor/bootstrap/TorQuickStart.kt - + app/src/main/res/drawable/ic_onion_pattern.xml - + app/src/main/res/drawable/ic_tor_config_bridge.xml - + app/src/main/res/drawable/ic_tor_connect_computer_graphic.xml - + app/src/main/res/drawable/ic_tor_network_settings.xml - app/src/main/res/drawable/rounded_corners.xml - app/src/main/res/drawable/tor_bootstrap_background_gradient.xml - app/src/main/res/layout/fragment_home.xml - app/src/main/res/layout/tor_bootstrap_connect.xml - app/src/main/res/layout/tor_bootstrap_logger.xml - app/src/main/res/navigation/nav_graph.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/0a4fbe8a8553… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/0a4fbe8a8553… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-57.0.6-10.0-2] 2 commits: Bug 40002: Ensure system download manager is not used
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components Commits: 8c794786 by Alex Catarineu at 2020-09-29T17:38:13+02:00 Bug 40002: Ensure system download manager is not used - - - - - 266410c6 by Matthew Finkel at 2020-09-30T12:53:55+00:00 Merge remote-tracking branch 'acatgl/40002' into android-components-57.0.6-10.0-2 - - - - - 3 changed files: - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt Changes: ===================================== components/feature/downloads/build.gradle ===================================== @@ -20,6 +20,8 @@ android { arg("room.schemaLocation", "$projectDir/schemas".toString()) } } + + buildConfigField("boolean", "ANDROID_DOWNLOADS_INTEGRATION", "false") } buildTypes { ===================================== components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt ===================================== @@ -326,7 +326,9 @@ abstract class AbstractFetchDownloadService : Service() { PAUSED -> DownloadNotification.createPausedDownloadNotification(context, download) FAILED -> DownloadNotification.createDownloadFailedNotification(context, download) COMPLETED -> { - addToDownloadSystemDatabaseCompat(download.state) + if (BuildConfig.ANDROID_DOWNLOADS_INTEGRATION) { + addToDownloadSystemDatabaseCompat(download.state) + } DownloadNotification.createDownloadCompletedNotification(context, download) } CANCELLED -> { @@ -688,7 +690,7 @@ abstract class AbstractFetchDownloadService : Service() { val downloadWithUniqueFileName = makeUniqueFileNameIfNecessary(download, append) updateDownloadState(downloadWithUniqueFileName) - if (getSdkVersion() >= Build.VERSION_CODES.Q && !isExternalStorageLegacy()) { + if (BuildConfig.ANDROID_DOWNLOADS_INTEGRATION && getSdkVersion() >= Build.VERSION_CODES.Q && !isExternalStorageLegacy()) { useFileStreamScopedStorage(downloadWithUniqueFileName, block) } else { useFileStreamLegacy(downloadWithUniqueFileName, append, block) ===================================== components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt ===================================== @@ -25,7 +25,6 @@ import mozilla.components.browser.state.state.SessionState import mozilla.components.browser.state.state.content.DownloadState import mozilla.components.browser.state.store.BrowserStore import mozilla.components.feature.downloads.DownloadDialogFragment.Companion.FRAGMENT_TAG -import mozilla.components.feature.downloads.manager.AndroidDownloadManager import mozilla.components.feature.downloads.manager.DownloadManager import mozilla.components.feature.downloads.manager.noop import mozilla.components.feature.downloads.manager.onDownloadStopped @@ -69,7 +68,7 @@ class DownloadsFeature( internal val useCases: DownloadsUseCases, override var onNeedToRequestPermissions: OnNeedToRequestPermissions = { }, onDownloadStopped: onDownloadStopped = noop, - private val downloadManager: DownloadManager = AndroidDownloadManager(applicationContext, store), + private val downloadManager: DownloadManager, private val tabId: String? = null, private val fragmentManager: FragmentManager? = null, private val promptsStyling: PromptsStyling? = null, View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bump mozac rebase branch
by sysrqb＠torproject.org 28 Sep '20

28 Sep '20

commit 13a9ee605b57a013b5b3c044ad127dfab320ecb5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 28 16:16:05 2020 +0000 Bump mozac rebase branch --- projects/android-components/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index c633375..1093a07 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-2-build1' git_url: https://gitlab.torproject.org/tpo/applications/android-components.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg @@ -18,7 +18,7 @@ var: targets: nightly: - git_hash: 'android-components-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'android-components-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 input_files:

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-57.0.6-10.0-2
by Matthew Finkel 28 Sep '20

28 Sep '20

Matthew Finkel pushed new branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit be335bfb52b05742dc27a91ff5993700bb05412e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 15:52:20 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 4e67ee2ef26e..4320a0de1d3a 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 4e67ee2ef26e28da0f02a0e43e22a61ee33c6d4d +Subproject commit 4320a0de1d3aab613a30c77c47ccfa812dab4441

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] Merge remote-tracking branch 'gitlab/merge-requests/50' into tor-browser-78.3.0esr-10.5-1
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit 7694fb95cdca2cea372681ff14473183b3378271 Merge: 94e52171a339 9233838b9b58 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 15:47:45 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/50' into tor-browser-78.3.0esr-10.5-1 browser/actors/WebRTCParent.jsm | 2 +- browser/base/content/aboutDialog.xhtml | 2 +- browser/base/content/aboutNetError.xhtml | 2 +- browser/base/content/aboutRestartRequired.xhtml | 2 +- browser/base/content/aboutTabCrashed.xhtml | 2 +- browser/base/content/blockedSite.xhtml | 2 +- browser/base/content/browser.js | 2 +- browser/base/content/browser.xhtml | 2 +- browser/base/content/macWindow.inc.xhtml | 2 +- browser/base/content/newInstallPage.html | 2 +- browser/base/content/safeMode.xhtml | 2 +- browser/base/content/webrtcIndicator.xhtml | 2 +- browser/components/aboutconfig/content/aboutconfig.html | 2 +- browser/components/aboutlogins/AboutLoginsParent.jsm | 4 ++-- browser/components/aboutlogins/content/aboutLogins.html | 2 +- browser/components/customizableui/content/panelUI.js | 2 +- .../components/enterprisepolicies/content/aboutPolicies.html | 2 +- browser/components/migration/content/aboutWelcomeBack.xhtml | 2 +- .../components/newtab/aboutwelcome/content/aboutwelcome.html | 2 +- browser/components/newtab/bin/render-activity-stream-html.js | 2 +- .../content-src/asrouter/templates/FirstRun/FirstRun.jsx | 2 +- .../newtab/data/content/abouthomecache/page.html.template | 2 +- .../components/newtab/data/content/activity-stream.bundle.js | 2 +- browser/components/newtab/lib/OnboardingMessageProvider.jsm | 2 +- browser/components/newtab/lib/RemoteL10n.jsm | 2 +- .../components/newtab/prerendered/activity-stream-debug.html | 2 +- .../newtab/prerendered/activity-stream-noscripts.html | 2 +- browser/components/newtab/prerendered/activity-stream.html | 2 +- .../components/newtab/test/unit/asrouter/RemoteL10n.test.js | 4 ++-- browser/components/pioneer/content/pioneer.html | 2 +- browser/components/preferences/dialogs/blocklists.xhtml | 2 +- .../components/preferences/dialogs/browserLanguages.xhtml | 2 +- browser/components/preferences/dialogs/clearSiteData.xhtml | 2 +- browser/components/preferences/dialogs/connection.xhtml | 2 +- browser/components/preferences/dialogs/sanitize.xhtml | 2 +- .../components/preferences/dialogs/siteDataSettings.xhtml | 2 +- browser/components/preferences/main.js | 2 +- browser/components/preferences/preferences.xhtml | 2 +- browser/components/preferences/privacy.js | 2 +- .../privatebrowsing/content/aboutPrivateBrowsing.html | 2 +- browser/components/protections/content/protections.html | 2 +- .../sessionstore/content/aboutSessionRestore.xhtml | 2 +- devtools/client/aboutdebugging/aboutdebugging.js | 2 +- intl/l10n/L10nRegistry.jsm | 12 ++++++++++++ security/manager/pki/resources/content/exceptionDialog.xhtml | 2 +- toolkit/components/certviewer/content/certviewer.html | 2 +- toolkit/content/aboutProfiles.xhtml | 2 +- toolkit/content/aboutRights-unbranded.xhtml | 2 +- toolkit/content/aboutRights.xhtml | 2 +- toolkit/content/aboutServiceWorkers.xhtml | 2 +- toolkit/content/aboutSupport.xhtml | 2 +- toolkit/content/aboutTelemetry.xhtml | 2 +- toolkit/content/resetProfile.xhtml | 2 +- toolkit/mozapps/downloads/content/unknownContentType.xhtml | 2 +- toolkit/mozapps/extensions/content/aboutaddons.html | 2 +- toolkit/mozapps/extensions/content/abuse-report-frame.html | 2 +- toolkit/mozapps/extensions/content/blocklist.xhtml | 2 +- toolkit/mozapps/extensions/content/extensions.xhtml | 2 +- toolkit/mozapps/preferences/changemp.xhtml | 2 +- toolkit/mozapps/update/content/updateElevation.xhtml | 2 +- toolkit/profile/content/createProfileWizard.xhtml | 2 +- toolkit/profile/content/profileDowngrade.xhtml | 2 +- toolkit/profile/content/profileSelection.xhtml | 2 +- 63 files changed, 76 insertions(+), 64 deletions(-)

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit 9233838b9b584fdfdb4b90d18482683d211e5b65 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jun 18 16:05:39 2020 +0200 fixup! Bug 2176: Rebrand Firefox to TorBrowser Fix for bug 33954. --- browser/actors/WebRTCParent.jsm | 2 +- browser/base/content/aboutDialog.xhtml | 2 +- browser/base/content/aboutNetError.xhtml | 2 +- browser/base/content/aboutRestartRequired.xhtml | 2 +- browser/base/content/aboutTabCrashed.xhtml | 2 +- browser/base/content/blockedSite.xhtml | 2 +- browser/base/content/browser.js | 2 +- browser/base/content/browser.xhtml | 2 +- browser/base/content/macWindow.inc.xhtml | 2 +- browser/base/content/newInstallPage.html | 2 +- browser/base/content/safeMode.xhtml | 2 +- browser/base/content/webrtcIndicator.xhtml | 2 +- browser/components/aboutconfig/content/aboutconfig.html | 2 +- browser/components/aboutlogins/AboutLoginsParent.jsm | 4 ++-- browser/components/aboutlogins/content/aboutLogins.html | 2 +- browser/components/customizableui/content/panelUI.js | 2 +- .../components/enterprisepolicies/content/aboutPolicies.html | 2 +- browser/components/migration/content/aboutWelcomeBack.xhtml | 2 +- .../components/newtab/aboutwelcome/content/aboutwelcome.html | 2 +- browser/components/newtab/bin/render-activity-stream-html.js | 2 +- .../content-src/asrouter/templates/FirstRun/FirstRun.jsx | 2 +- .../newtab/data/content/abouthomecache/page.html.template | 2 +- .../components/newtab/data/content/activity-stream.bundle.js | 2 +- browser/components/newtab/lib/OnboardingMessageProvider.jsm | 2 +- browser/components/newtab/lib/RemoteL10n.jsm | 2 +- .../components/newtab/prerendered/activity-stream-debug.html | 2 +- .../newtab/prerendered/activity-stream-noscripts.html | 2 +- browser/components/newtab/prerendered/activity-stream.html | 2 +- .../components/newtab/test/unit/asrouter/RemoteL10n.test.js | 4 ++-- browser/components/pioneer/content/pioneer.html | 2 +- browser/components/preferences/dialogs/blocklists.xhtml | 2 +- .../components/preferences/dialogs/browserLanguages.xhtml | 2 +- browser/components/preferences/dialogs/clearSiteData.xhtml | 2 +- browser/components/preferences/dialogs/connection.xhtml | 2 +- browser/components/preferences/dialogs/sanitize.xhtml | 2 +- .../components/preferences/dialogs/siteDataSettings.xhtml | 2 +- browser/components/preferences/main.js | 2 +- browser/components/preferences/preferences.xhtml | 2 +- browser/components/preferences/privacy.js | 2 +- .../privatebrowsing/content/aboutPrivateBrowsing.html | 2 +- browser/components/protections/content/protections.html | 2 +- .../sessionstore/content/aboutSessionRestore.xhtml | 2 +- devtools/client/aboutdebugging/aboutdebugging.js | 2 +- intl/l10n/L10nRegistry.jsm | 12 ++++++++++++ security/manager/pki/resources/content/exceptionDialog.xhtml | 2 +- toolkit/components/certviewer/content/certviewer.html | 2 +- toolkit/content/aboutProfiles.xhtml | 2 +- toolkit/content/aboutRights-unbranded.xhtml | 2 +- toolkit/content/aboutRights.xhtml | 2 +- toolkit/content/aboutServiceWorkers.xhtml | 2 +- toolkit/content/aboutSupport.xhtml | 2 +- toolkit/content/aboutTelemetry.xhtml | 2 +- toolkit/content/resetProfile.xhtml | 2 +- toolkit/mozapps/downloads/content/unknownContentType.xhtml | 2 +- toolkit/mozapps/extensions/content/aboutaddons.html | 2 +- toolkit/mozapps/extensions/content/abuse-report-frame.html | 2 +- toolkit/mozapps/extensions/content/blocklist.xhtml | 2 +- toolkit/mozapps/extensions/content/extensions.xhtml | 2 +- toolkit/mozapps/preferences/changemp.xhtml | 2 +- toolkit/mozapps/update/content/updateElevation.xhtml | 2 +- toolkit/profile/content/createProfileWizard.xhtml | 2 +- toolkit/profile/content/profileDowngrade.xhtml | 2 +- toolkit/profile/content/profileSelection.xhtml | 2 +- 63 files changed, 76 insertions(+), 64 deletions(-) diff --git a/browser/actors/WebRTCParent.jsm b/browser/actors/WebRTCParent.jsm index d50845f9001a..fea1897d63d4 100644 --- a/browser/actors/WebRTCParent.jsm +++ b/browser/actors/WebRTCParent.jsm @@ -482,7 +482,7 @@ function prompt(aActor, aBrowser, aRequest) { let chromeDoc = aBrowser.ownerDocument; let stringBundle = chromeDoc.defaultView.gNavigatorBundle; let localization = new Localization( - ["branding/tor-browser-brand.ftl", "browser/browser.ftl"], + ["branding/brand.ftl", "browser/browser.ftl"], true ); diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml index 02096fbfa3c0..5274cbc02831 100644 --- a/browser/base/content/aboutDialog.xhtml +++ b/browser/base/content/aboutDialog.xhtml @@ -35,7 +35,7 @@ #endif <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/> </linkset> diff --git a/browser/base/content/aboutNetError.xhtml b/browser/base/content/aboutNetError.xhtml index 120d4637f533..957b6f15a0be 100644 --- a/browser/base/content/aboutNetError.xhtml +++ b/browser/base/content/aboutNetError.xhtml @@ -27,7 +27,7 @@ <link rel="icon" id="favicon" href="chrome://global/skin/icons/warning.svg"/> <link rel="localization" href="browser/aboutCertError.ftl" /> <link rel="localization" href="browser/nsserrors.ftl" /> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> </head> <body dir="&locale.dir;"> diff --git a/browser/base/content/aboutRestartRequired.xhtml b/browser/base/content/aboutRestartRequired.xhtml index 6b5ce7c201c8..c7e7b9dcbb91 100644 --- a/browser/base/content/aboutRestartRequired.xhtml +++ b/browser/base/content/aboutRestartRequired.xhtml @@ -15,7 +15,7 @@ toolkit/components/places/src/nsFaviconService.h should be updated. --> <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning.svg"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/aboutRestartRequired.ftl"/> </head> <body> diff --git a/browser/base/content/aboutTabCrashed.xhtml b/browser/base/content/aboutTabCrashed.xhtml index fd7d8f71ae9f..6ac50822f334 100644 --- a/browser/base/content/aboutTabCrashed.xhtml +++ b/browser/base/content/aboutTabCrashed.xhtml @@ -15,7 +15,7 @@ href="chrome://browser/content/aboutTabCrashed.css"/> <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/skin/aboutTabCrashed.css"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/aboutTabCrashed.ftl"/> <title data-l10n-id="crashed-title"></title> diff --git a/browser/base/content/blockedSite.xhtml b/browser/base/content/blockedSite.xhtml index af64566af1ac..4601b0db82d7 100644 --- a/browser/base/content/blockedSite.xhtml +++ b/browser/base/content/blockedSite.xhtml @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> <link rel="stylesheet" href="chrome://browser/skin/blockedSite.css" type="text/css" media="all" /> <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/blocklist_favicon.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/safebrowsing/blockedSite.ftl"/> </head> <body> diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 3f019c5f24c1..230484af503f 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -942,7 +942,7 @@ const gStoragePressureObserver = { } this._lastNotificationTime = Date.now(); - MozXULElement.insertFTLIfNeeded("branding/tor-browser-brand.ftl"); + MozXULElement.insertFTLIfNeeded("branding/brand.ftl"); MozXULElement.insertFTLIfNeeded("browser/preferences/preferences.ftl"); const BYTES_IN_GIGABYTE = 1073741824; diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml index d51fb0f914f3..fd9a5d14aeb2 100644 --- a/browser/base/content/browser.xhtml +++ b/browser/base/content/browser.xhtml @@ -68,7 +68,7 @@ persist="screenX screenY width height sizemode" data-l10n-sync="true"> <head> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"/> <link rel="localization" href="browser/branding/brandings.ftl"/> <link rel="localization" href="toolkit/global/textActions.ftl"/> diff --git a/browser/base/content/macWindow.inc.xhtml b/browser/base/content/macWindow.inc.xhtml index a4ba07c94d7a..d6327086ff32 100644 --- a/browser/base/content/macWindow.inc.xhtml +++ b/browser/base/content/macWindow.inc.xhtml @@ -11,7 +11,7 @@ # browser-doctype.inc must also be included. <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/branding/sync-brand.ftl"/> <html:link rel="localization" href="toolkit/global/textActions.ftl"/> <html:link rel="localization" href="browser/browserSets.ftl"/> diff --git a/browser/base/content/newInstallPage.html b/browser/base/content/newInstallPage.html index 4c0c4bc69d27..3b7604030f05 100644 --- a/browser/base/content/newInstallPage.html +++ b/browser/base/content/newInstallPage.html @@ -10,7 +10,7 @@ <meta name="referrer" content="no-referrer"> <link rel="stylesheet" type="text/css" href="chrome://global/skin/in-content/common.css"> <link rel="stylesheet" type="text/css" href="chrome://browser/skin/newInstallPage.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/newInstallPage.ftl"> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"> diff --git a/browser/base/content/safeMode.xhtml b/browser/base/content/safeMode.xhtml index 7f10b95b9874..5c95e191372b 100644 --- a/browser/base/content/safeMode.xhtml +++ b/browser/base/content/safeMode.xhtml @@ -18,7 +18,7 @@ buttonidextra1="refresh-profile"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/safeMode.ftl"/> </linkset> diff --git a/browser/base/content/webrtcIndicator.xhtml b/browser/base/content/webrtcIndicator.xhtml index 80b0a12c0329..e56d175a9121 100644 --- a/browser/base/content/webrtcIndicator.xhtml +++ b/browser/base/content/webrtcIndicator.xhtml @@ -20,7 +20,7 @@ chromemargin="0,0,0,0"> <head> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/webrtcIndicator.ftl"/> #ifndef XP_MACOSX <title data-l10n-id="webrtc-indicator-title"></title> diff --git a/browser/components/aboutconfig/content/aboutconfig.html b/browser/components/aboutconfig/content/aboutconfig.html index 5c9dfd830a02..ce7f258f8db6 100644 --- a/browser/components/aboutconfig/content/aboutconfig.html +++ b/browser/components/aboutconfig/content/aboutconfig.html @@ -13,7 +13,7 @@ href="chrome://global/skin/in-content/info-pages.css" title="infop"> <link rel="stylesheet" type="text/css" href="chrome://browser/content/aboutconfig/aboutconfig.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/aboutConfig.ftl"> <script src="chrome://browser/content/aboutconfig/aboutconfig.js"></script> <title data-l10n-id="about-config-page-title"></title> diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm index 5d0a0e4e83b9..d06d6d0ec6c7 100644 --- a/browser/components/aboutlogins/AboutLoginsParent.jsm +++ b/browser/components/aboutlogins/AboutLoginsParent.jsm @@ -52,7 +52,7 @@ XPCOMUtils.defineLazyPreferenceGetter( false ); XPCOMUtils.defineLazyGetter(this, "AboutLoginsL10n", () => { - return new Localization(["branding/tor-browser-brand.ftl", "browser/aboutLogins.ftl"]); + return new Localization(["branding/brand.ftl", "browser/aboutLogins.ftl"]); }); const ABOUT_LOGINS_ORIGIN = "about:logins"; @@ -716,7 +716,7 @@ var AboutLogins = { ); }, ], - extraFtl: ["branding/tor-browser-brand.ftl", "browser/branding/sync-brand.ftl"], + extraFtl: ["branding/brand.ftl", "browser/branding/sync-brand.ftl"], }); }, diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html index 209681adcd39..3b4f100d4b27 100644 --- a/browser/components/aboutlogins/content/aboutLogins.html +++ b/browser/components/aboutlogins/content/aboutLogins.html @@ -8,7 +8,7 @@ <meta charset="utf-8"> <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; img-src data: blob: https://firefoxusercontent.com;"/> <title data-l10n-id="about-logins-page-title"></title> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/branding/brandings.ftl"> <link rel="localization" href="browser/aboutLogins.ftl"> diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js index 97b6af51b22b..1f1d39aa23ec 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -898,7 +898,7 @@ const PanelUI = { let anchor = this._getPanelAnchor(this.menuButton); // Insert Fluent files when needed before notification is opened - MozXULElement.insertFTLIfNeeded("branding/tor-browser-brand.ftl"); + MozXULElement.insertFTLIfNeeded("branding/brand.ftl"); MozXULElement.insertFTLIfNeeded("browser/appMenuNotifications.ftl"); // After Fluent files are loaded into document replace data-lazy-l10n-ids with actual ones diff --git a/browser/components/enterprisepolicies/content/aboutPolicies.html b/browser/components/enterprisepolicies/content/aboutPolicies.html index 3deb79c0f989..e1da06927128 100644 --- a/browser/components/enterprisepolicies/content/aboutPolicies.html +++ b/browser/components/enterprisepolicies/content/aboutPolicies.html @@ -10,7 +10,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'"> <title data-l10n-id="about-policies-title"></title> <link rel="stylesheet" href="chrome://browser/content/policies/aboutPolicies.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/aboutPolicies.ftl"> <link rel="localization" href="browser/policies/policies-descriptions.ftl"> diff --git a/browser/components/migration/content/aboutWelcomeBack.xhtml b/browser/components/migration/content/aboutWelcomeBack.xhtml index 3958822f560f..e4c02d23d3c1 100644 --- a/browser/components/migration/content/aboutWelcomeBack.xhtml +++ b/browser/components/migration/content/aboutWelcomeBack.xhtml @@ -17,7 +17,7 @@ <link rel="stylesheet" href="chrome://browser/skin/aboutWelcomeBack.css" type="text/css" media="all"/> <link rel="icon" type="image/png" href="chrome://browser/skin/info.svg"/> <link rel="localization" href="browser/aboutSessionRestore.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <script src="chrome://browser/content/aboutSessionRestore.js"/> </head> diff --git a/browser/components/newtab/aboutwelcome/content/aboutwelcome.html b/browser/components/newtab/aboutwelcome/content/aboutwelcome.html index a2e7dbdc3342..76d9d6be499e 100644 --- a/browser/components/newtab/aboutwelcome/content/aboutwelcome.html +++ b/browser/components/newtab/aboutwelcome/content/aboutwelcome.html @@ -10,7 +10,7 @@ <title data-l10n-id="onboarding-welcome-header"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"> <link rel="stylesheet" href="resource://activity-stream/aboutwelcome/aboutwelcome.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"/> <link rel="localization" href="browser/branding/brandings.ftl"/> <link rel="localization" href="browser/newtab/onboarding.ftl"/> diff --git a/browser/components/newtab/bin/render-activity-stream-html.js b/browser/components/newtab/bin/render-activity-stream-html.js index 22745cf4ea60..4c2bb95cb16b 100644 --- a/browser/components/newtab/bin/render-activity-stream-html.js +++ b/browser/components/newtab/bin/render-activity-stream-html.js @@ -58,7 +58,7 @@ function templateHTML(options) { <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx b/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx index 428c388038dc..209ffff0c1f7 100644 --- a/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx +++ b/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx @@ -11,7 +11,7 @@ import { BASE_PARAMS } from "./addUtmParams"; const TRANSITION_LENGTH = 500; export const FLUENT_FILES = [ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl", diff --git a/browser/components/newtab/data/content/abouthomecache/page.html.template b/browser/components/newtab/data/content/abouthomecache/page.html.template index cf25f51146ff..f55893077c0e 100644 --- a/browser/components/newtab/data/content/abouthomecache/page.html.template +++ b/browser/components/newtab/data/content/abouthomecache/page.html.template @@ -25,7 +25,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js index 6d2b809735eb..a49d80f05cf7 100644 --- a/browser/components/newtab/data/content/activity-stream.bundle.js +++ b/browser/components/newtab/data/content/activity-stream.bundle.js @@ -15890,7 +15890,7 @@ var addUtmParams = __webpack_require__(18); // Note: should match the transition time on .trailheadCards in _Trailhead.scss const TRANSITION_LENGTH = 500; -const FLUENT_FILES = ["branding/tor-browser-brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl"]; +const FLUENT_FILES = ["branding/brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl"]; const helpers = { addFluent(document) { FLUENT_FILES.forEach(file => { diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm index cc2dd91afa01..99c958eab29e 100644 --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm @@ -19,7 +19,7 @@ const { FX_MONITOR_OAUTH_CLIENT_ID } = ChromeUtils.import( const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const L10N = new Localization([ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl", diff --git a/browser/components/newtab/lib/RemoteL10n.jsm b/browser/components/newtab/lib/RemoteL10n.jsm index 90c587cc560b..72dcf915d81f 100644 --- a/browser/components/newtab/lib/RemoteL10n.jsm +++ b/browser/components/newtab/lib/RemoteL10n.jsm @@ -67,7 +67,7 @@ class _RemoteL10n { "browser/newtab/asrouter.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", ], false, Services.prefs.getBoolPref(USE_REMOTE_L10N_PREF, true) diff --git a/browser/components/newtab/prerendered/activity-stream-debug.html b/browser/components/newtab/prerendered/activity-stream-debug.html index c410f5a474bf..72c2d8f6d3ac 100644 --- a/browser/components/newtab/prerendered/activity-stream-debug.html +++ b/browser/components/newtab/prerendered/activity-stream-debug.html @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/prerendered/activity-stream-noscripts.html b/browser/components/newtab/prerendered/activity-stream-noscripts.html index c9d0eb026294..c7ceabc82fd3 100644 --- a/browser/components/newtab/prerendered/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/activity-stream-noscripts.html @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/prerendered/activity-stream.html b/browser/components/newtab/prerendered/activity-stream.html index 809e29c65529..af52351782c1 100644 --- a/browser/components/newtab/prerendered/activity-stream.html +++ b/browser/components/newtab/prerendered/activity-stream.html @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js b/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js index a57565e29a7d..7552b5236469 100644 --- a/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js +++ b/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js @@ -63,7 +63,7 @@ describe("RemoteL10n", () => { "browser/newtab/asrouter.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", ]); assert.isFalse(args[1]); assert.isFunction(args[2].generateBundles); @@ -81,7 +81,7 @@ describe("RemoteL10n", () => { "browser/newtab/asrouter.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", ]); assert.isFalse(args[1]); assert.isEmpty(args[2]); diff --git a/browser/components/pioneer/content/pioneer.html b/browser/components/pioneer/content/pioneer.html index 897e1c84444b..dc5dc6031e0b 100644 --- a/browser/components/pioneer/content/pioneer.html +++ b/browser/components/pioneer/content/pioneer.html @@ -8,7 +8,7 @@ <meta charset="utf-8"> <meta http-equiv="Content-Security-Policy" content="default-src chrome: blob:; img-src https:; object-src 'none'"> <link rel="localization" href="browser/branding/brandings.ftl"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl">  <link rel="localization" href="preview/pioneer.ftl"> <link rel="stylesheet" href="chrome://global/skin/in-content/common.css"> diff --git a/browser/components/preferences/dialogs/blocklists.xhtml b/browser/components/preferences/dialogs/blocklists.xhtml index c7141bd86d31..3cccc1952c9a 100644 --- a/browser/components/preferences/dialogs/blocklists.xhtml +++ b/browser/components/preferences/dialogs/blocklists.xhtml @@ -19,7 +19,7 @@ onkeypress="gBlocklistManager.onWindowKeyPress(event);"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/blocklists.ftl"/> </linkset> diff --git a/browser/components/preferences/dialogs/browserLanguages.xhtml b/browser/components/preferences/dialogs/browserLanguages.xhtml index e691773b45b9..2e6065870481 100644 --- a/browser/components/preferences/dialogs/browserLanguages.xhtml +++ b/browser/components/preferences/dialogs/browserLanguages.xhtml @@ -19,7 +19,7 @@ helpTopic="change-language"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/languages.ftl"/> </linkset> diff --git a/browser/components/preferences/dialogs/clearSiteData.xhtml b/browser/components/preferences/dialogs/clearSiteData.xhtml index 5c3714fb391c..fb289f2d27be 100644 --- a/browser/components/preferences/dialogs/clearSiteData.xhtml +++ b/browser/components/preferences/dialogs/clearSiteData.xhtml @@ -17,7 +17,7 @@ persist="screenX screenY width height"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/clearSiteData.ftl"/> </linkset> <script src="chrome://browser/content/preferences/dialogs/clearSiteData.js"/> diff --git a/browser/components/preferences/dialogs/connection.xhtml b/browser/components/preferences/dialogs/connection.xhtml index c7fffda08294..ab7c107992bc 100644 --- a/browser/components/preferences/dialogs/connection.xhtml +++ b/browser/components/preferences/dialogs/connection.xhtml @@ -22,7 +22,7 @@ <linkset> <html:link rel="localization" href="browser/preferences/connection.ftl"/> <html:link rel="localization" href="browser/preferences/preferences.ftl"/> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> </linkset> <script src="chrome://browser/content/utilityOverlay.js"/> diff --git a/browser/components/preferences/dialogs/sanitize.xhtml b/browser/components/preferences/dialogs/sanitize.xhtml index ae97656a4f69..73e7d8acce07 100644 --- a/browser/components/preferences/dialogs/sanitize.xhtml +++ b/browser/components/preferences/dialogs/sanitize.xhtml @@ -23,7 +23,7 @@ <linkset> <html:link rel="localization" href="browser/sanitize.ftl"/> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> </linkset> <script src="chrome://browser/content/utilityOverlay.js"/> diff --git a/browser/components/preferences/dialogs/siteDataSettings.xhtml b/browser/components/preferences/dialogs/siteDataSettings.xhtml index 834f0d9bb924..6e184c2bd83c 100644 --- a/browser/components/preferences/dialogs/siteDataSettings.xhtml +++ b/browser/components/preferences/dialogs/siteDataSettings.xhtml @@ -20,7 +20,7 @@ persist="screenX screenY width height"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/siteDataSettings.ftl"/> </linkset> diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js index 329cbeba163a..6b258429e773 100644 --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -249,7 +249,7 @@ function getBundleForLocales(newLocales) { return L10nRegistry.generateBundles(locales, resourceIds); } return new Localization( - ["browser/preferences/preferences.ftl", "branding/tor-browser-brand.ftl"], + ["browser/preferences/preferences.ftl", "branding/brand.ftl"], false, { generateBundles } ); diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml index 2d01c5c8b775..b09808e83c45 100644 --- a/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml @@ -35,7 +35,7 @@ <title data-l10n-id="pref-page-title"></title> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/brandings.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"/> <link rel="localization" href="browser/preferences/preferences.ftl"/> diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js index 7f24a0a659f5..92f35dc78d12 100644 --- a/browser/components/preferences/privacy.js +++ b/browser/components/preferences/privacy.js @@ -31,7 +31,7 @@ ChromeUtils.defineModuleGetter( ); XPCOMUtils.defineLazyGetter(this, "L10n", () => { return new Localization([ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "browser/preferences/preferences.ftl", ]); }); diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html index 98e596a5b81c..8611936b0083 100644 --- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html +++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html @@ -11,7 +11,7 @@ <link rel="icon" href="chrome://browser/skin/privatebrowsing/favicon.svg"/> <link rel="stylesheet" href="chrome://browser/content/aboutPrivateBrowsing.css" media="all"/> <link rel="stylesheet" href="chrome://browser/skin/privatebrowsing/aboutPrivateBrowsing.css" media="all"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/aboutPrivateBrowsing.ftl"/> <script src="chrome://browser/content/aboutPrivateBrowsing.js"></script> <script src="chrome://browser/content/contentSearchHandoffUI.js"></script> diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html index bed9dbd4e145..e7aac37ed6ea 100644 --- a/browser/components/protections/content/protections.html +++ b/browser/components/protections/content/protections.html @@ -8,7 +8,7 @@ <meta charset="utf-8"> <meta http-equiv="Content-Security-Policy" content="default-src chrome: blob:; object-src 'none'"> <link rel="localization" href="browser/branding/brandings.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/protections.ftl">  diff --git a/browser/components/sessionstore/content/aboutSessionRestore.xhtml b/browser/components/sessionstore/content/aboutSessionRestore.xhtml index 41dbe15f76bf..05c0e4f732ee 100644 --- a/browser/components/sessionstore/content/aboutSessionRestore.xhtml +++ b/browser/components/sessionstore/content/aboutSessionRestore.xhtml @@ -17,7 +17,7 @@ <link rel="stylesheet" href="chrome://browser/skin/aboutSessionRestore.css" type="text/css" media="all"/> <link rel="icon" href="chrome://global/skin/icons/warning.svg"/> <link rel="localization" href="browser/aboutSessionRestore.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <script src="chrome://browser/content/aboutSessionRestore.js"/> </head> diff --git a/devtools/client/aboutdebugging/aboutdebugging.js b/devtools/client/aboutdebugging/aboutdebugging.js index 8a6795de2246..bbe97b7170d5 100644 --- a/devtools/client/aboutdebugging/aboutdebugging.js +++ b/devtools/client/aboutdebugging/aboutdebugging.js @@ -89,7 +89,7 @@ const AboutDebugging = { this.actions.recordTelemetryEvent("open_adbg", { width }); await l10n.init([ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "devtools/client/aboutdebugging.ftl", ]); diff --git a/intl/l10n/L10nRegistry.jsm b/intl/l10n/L10nRegistry.jsm index 69e09f5aa99e..684502ad9002 100644 --- a/intl/l10n/L10nRegistry.jsm +++ b/intl/l10n/L10nRegistry.jsm @@ -139,6 +139,12 @@ class L10nRegistryService { async* generateBundles(requestedLangs, resourceIds) { const resourceIdsDedup = Array.from(new Set(resourceIds)); const sourcesOrder = Array.from(this.sources.keys()).reverse(); + // Always prioritize torbutton sources (keep in sync with generateBundlesSync) + const idxTB = sourcesOrder.indexOf("torbutton"); + if (idxTB > 0) { + sourcesOrder.splice(idxTB, 1); + sourcesOrder.unshift("torbutton"); + } const pseudoStrategy = Services.prefs.getStringPref("intl.l10n.pseudo", ""); for (const locale of requestedLangs) { for await (const dataSets of generateResourceSetsForLocale(locale, sourcesOrder, resourceIdsDedup)) { @@ -172,6 +178,12 @@ class L10nRegistryService { * generateBundlesSync(requestedLangs, resourceIds) { const resourceIdsDedup = Array.from(new Set(resourceIds)); const sourcesOrder = Array.from(this.sources.keys()).reverse(); + // Always prioritize torbutton sources (keep in sync with generateBundles) + const idxTB = sourcesOrder.indexOf("torbutton"); + if (idxTB > 0) { + sourcesOrder.splice(idxTB, 1); + sourcesOrder.unshift("torbutton"); + } const pseudoStrategy = Services.prefs.getStringPref("intl.l10n.pseudo", ""); for (const locale of requestedLangs) { for (const dataSets of generateResourceSetsForLocaleSync(locale, sourcesOrder, resourceIdsDedup)) { diff --git a/security/manager/pki/resources/content/exceptionDialog.xhtml b/security/manager/pki/resources/content/exceptionDialog.xhtml index 5c0c256aa2bb..56be4bc5cbd4 100644 --- a/security/manager/pki/resources/content/exceptionDialog.xhtml +++ b/security/manager/pki/resources/content/exceptionDialog.xhtml @@ -19,7 +19,7 @@ defaultButton="extra2"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="security/certificates/certManager.ftl"/> </linkset> diff --git a/toolkit/components/certviewer/content/certviewer.html b/toolkit/components/certviewer/content/certviewer.html index bc78dd5fc18e..3f097e48ada5 100644 --- a/toolkit/components/certviewer/content/certviewer.html +++ b/toolkit/components/certviewer/content/certviewer.html @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width" /> <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> <link rel="localization" href="toolkit/about/certviewer.ftl"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <script defer="defer" src="chrome://global/content/certviewer/pvutils_bundle.js"></script> <script defer="defer" src="chrome://global/content/certviewer/asn1js_bundle.js"></script> <script defer="defer" src="chrome://global/content/certviewer/pkijs_bundle.js"></script> diff --git a/toolkit/content/aboutProfiles.xhtml b/toolkit/content/aboutProfiles.xhtml index 0411a687525d..56a43b3dd155 100644 --- a/toolkit/content/aboutProfiles.xhtml +++ b/toolkit/content/aboutProfiles.xhtml @@ -13,7 +13,7 @@ <link rel="icon" type="image/png" id="favicon" href="chrome://branding/content/icon32.png" /> <link rel="stylesheet" href="chrome://mozapps/skin/aboutProfiles.css" type="text/css" /> <script src="chrome://global/content/aboutProfiles.js" /> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="toolkit/about/aboutProfiles.ftl" /> </head> <body id="body" class="wide-container"> diff --git a/toolkit/content/aboutRights-unbranded.xhtml b/toolkit/content/aboutRights-unbranded.xhtml index 89e212bc4c5d..44c4c350b2d0 100644 --- a/toolkit/content/aboutRights-unbranded.xhtml +++ b/toolkit/content/aboutRights-unbranded.xhtml @@ -14,7 +14,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> <title data-l10n-id="rights-title"></title> <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutRights.ftl"/> </head> diff --git a/toolkit/content/aboutRights.xhtml b/toolkit/content/aboutRights.xhtml index ff7e2455f312..23dfe8512e1c 100644 --- a/toolkit/content/aboutRights.xhtml +++ b/toolkit/content/aboutRights.xhtml @@ -15,7 +15,7 @@ <title data-l10n-id="rights-title"></title> <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/> <link rel="stylesheet" href="chrome://global/skin/aboutRights.css" type="text/css"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutRights.ftl"/> </head> diff --git a/toolkit/content/aboutServiceWorkers.xhtml b/toolkit/content/aboutServiceWorkers.xhtml index 0d00241f851c..6bf38033e3e6 100644 --- a/toolkit/content/aboutServiceWorkers.xhtml +++ b/toolkit/content/aboutServiceWorkers.xhtml @@ -15,7 +15,7 @@ <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css" /> <link rel="stylesheet" href="chrome://mozapps/skin/aboutServiceWorkers.css" type="text/css" /> <link rel="localization" href="toolkit/about/aboutServiceWorkers.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <script src="chrome://global/content/aboutServiceWorkers.js" /> </head> <body id="body"> diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml index c6c5be1470d6..ef35864d52b5 100644 --- a/toolkit/content/aboutSupport.xhtml +++ b/toolkit/content/aboutSupport.xhtml @@ -20,7 +20,7 @@ type="text/css"/> <script src="chrome://global/content/aboutSupport.js"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutSupport.ftl"/> <link rel="localization" href="toolkit/global/resetProfile.ftl"/> <link rel="localization" href="toolkit/global/processTypes.ftl"/> diff --git a/toolkit/content/aboutTelemetry.xhtml b/toolkit/content/aboutTelemetry.xhtml index dada800b0bfe..1998b12b0655 100644 --- a/toolkit/content/aboutTelemetry.xhtml +++ b/toolkit/content/aboutTelemetry.xhtml @@ -14,7 +14,7 @@ type="text/css"/> <script src="chrome://global/content/aboutTelemetry.js"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutTelemetry.ftl"/> </head> diff --git a/toolkit/content/resetProfile.xhtml b/toolkit/content/resetProfile.xhtml index 6f2b7ab8c22d..7ddafefef0e8 100644 --- a/toolkit/content/resetProfile.xhtml +++ b/toolkit/content/resetProfile.xhtml @@ -17,7 +17,7 @@  <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/resetProfile.ftl"/> </linkset> diff --git a/toolkit/mozapps/downloads/content/unknownContentType.xhtml b/toolkit/mozapps/downloads/content/unknownContentType.xhtml index a23d03be4a3b..9a9551d59a43 100644 --- a/toolkit/mozapps/downloads/content/unknownContentType.xhtml +++ b/toolkit/mozapps/downloads/content/unknownContentType.xhtml @@ -29,7 +29,7 @@ persist="screenX screenY" aria-describedby="intro location whichIs type from source unknownPrompt"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/unknownContentType.ftl"/> </linkset> <dialog id="unknownContentType"> diff --git a/toolkit/mozapps/extensions/content/aboutaddons.html b/toolkit/mozapps/extensions/content/aboutaddons.html index dc30e8c79f52..afe6a9956501 100644 --- a/toolkit/mozapps/extensions/content/aboutaddons.html +++ b/toolkit/mozapps/extensions/content/aboutaddons.html @@ -17,7 +17,7 @@ <link rel="stylesheet" href="chrome://mozapps/content/extensions/aboutaddons.css"> <link rel="stylesheet" href="chrome://mozapps/content/extensions/shortcuts.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="toolkit/about/aboutAddons.ftl"> <link rel="localization" href="toolkit/about/abuseReports.ftl"> diff --git a/toolkit/mozapps/extensions/content/abuse-report-frame.html b/toolkit/mozapps/extensions/content/abuse-report-frame.html index 5737db251688..16f84d456c0a 100644 --- a/toolkit/mozapps/extensions/content/abuse-report-frame.html +++ b/toolkit/mozapps/extensions/content/abuse-report-frame.html @@ -10,7 +10,7 @@ <link rel="stylesheet" href="chrome://mozapps/content/extensions/aboutaddons.css"> <link rel="stylesheet" href="chrome://mozapps/content/extensions/abuse-report-panel.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="toolkit/about/aboutAddons.ftl"> <link rel="localization" href="toolkit/about/abuseReports.ftl"> diff --git a/toolkit/mozapps/extensions/content/blocklist.xhtml b/toolkit/mozapps/extensions/content/blocklist.xhtml index dd3e8ed00244..68d0004044d6 100644 --- a/toolkit/mozapps/extensions/content/blocklist.xhtml +++ b/toolkit/mozapps/extensions/content/blocklist.xhtml @@ -23,7 +23,7 @@ buttonidaccept="blocklist-accept"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/extensions/blocklist.ftl"/> </linkset> diff --git a/toolkit/mozapps/extensions/content/extensions.xhtml b/toolkit/mozapps/extensions/content/extensions.xhtml index 62b1cea9f416..f5b05018f768 100644 --- a/toolkit/mozapps/extensions/content/extensions.xhtml +++ b/toolkit/mozapps/extensions/content/extensions.xhtml @@ -14,7 +14,7 @@ <xhtml:link rel="shortcut icon" href="chrome://mozapps/skin/extensions/extension.svg"/> <linkset> - <xhtml:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <xhtml:link rel="localization" href="branding/brand.ftl"/> <xhtml:link rel="localization" href="toolkit/about/aboutAddons.ftl"/> </linkset> diff --git a/toolkit/mozapps/preferences/changemp.xhtml b/toolkit/mozapps/preferences/changemp.xhtml index 9329d8b03e49..3b6941b42abf 100644 --- a/toolkit/mozapps/preferences/changemp.xhtml +++ b/toolkit/mozapps/preferences/changemp.xhtml @@ -16,7 +16,7 @@ <script src="chrome://mozapps/content/preferences/changemp.js"/> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/preferences/preferences.ftl"/> </linkset> diff --git a/toolkit/mozapps/update/content/updateElevation.xhtml b/toolkit/mozapps/update/content/updateElevation.xhtml index 34fe998e9ab6..46ddc5ef7d1b 100644 --- a/toolkit/mozapps/update/content/updateElevation.xhtml +++ b/toolkit/mozapps/update/content/updateElevation.xhtml @@ -32,7 +32,7 @@ <script src="chrome://global/content/editMenuOverlay.js"/> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/updates/elevation.ftl"/> </linkset> diff --git a/toolkit/profile/content/createProfileWizard.xhtml b/toolkit/profile/content/createProfileWizard.xhtml index 5726b8ece29c..9b0dea9547ab 100644 --- a/toolkit/profile/content/createProfileWizard.xhtml +++ b/toolkit/profile/content/createProfileWizard.xhtml @@ -17,7 +17,7 @@ > <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/createProfileWizard.ftl"/> </linkset> diff --git a/toolkit/profile/content/profileDowngrade.xhtml b/toolkit/profile/content/profileDowngrade.xhtml index 9f8c51f4a92b..c2e4c359b79a 100644 --- a/toolkit/profile/content/profileDowngrade.xhtml +++ b/toolkit/profile/content/profileDowngrade.xhtml @@ -17,7 +17,7 @@ <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/branding/sync-brand.ftl"/> <html:link rel="localization" href="toolkit/global/profileDowngrade.ftl"/> </linkset> diff --git a/toolkit/profile/content/profileSelection.xhtml b/toolkit/profile/content/profileSelection.xhtml index 9e071ad95e2a..182eceff7ee8 100644 --- a/toolkit/profile/content/profileSelection.xhtml +++ b/toolkit/profile/content/profileSelection.xhtml @@ -24,7 +24,7 @@ buttonidcancel="profile-selection-button-cancel"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/profileSelection.ftl"/> </linkset>

1 0