- tbb-commits - lists.torproject.org

[Git][tpo/applications/fenix][tor-browser-102.2.1-12.0-1] yec22 home fragment, theming, and timegate toggle
by Richard Pospesel (＠richard) 02 Dec '22

02 Dec '22

Richard Pospesel pushed to branch tor-browser-102.2.1-12.0-1 at The Tor Project / Applications / fenix Commits: f9aea110 by Dan Ballard at 2022-12-02T12:09:59+00:00 yec22 home fragment, theming, and timegate toggle - - - - - 11 changed files: - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt - + app/src/main/res/drawable/ic_yec22_bg_combined_android_3x.png - + app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml - + app/src/main/res/font/spacegrotesk_light.ttf - + app/src/main/res/font/spacegrotesk_regular.ttf - + app/src/main/res/font/spacegrotesk_semibold.ttf - + app/src/main/res/font/spacemono_bold.ttf - app/src/main/res/layout/fragment_home.xml - app/src/main/res/values/colors.xml - app/src/main/res/values/styles.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -10,11 +10,8 @@ import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.os.StrictMode -import android.view.Gravity -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.view.ViewTreeObserver +import android.util.Log +import android.view.* import android.widget.Button import android.widget.LinearLayout import android.widget.PopupWindow @@ -22,16 +19,10 @@ import androidx.annotation.VisibleForTesting import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet -import androidx.constraintlayout.widget.ConstraintSet.BOTTOM -import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID -import androidx.constraintlayout.widget.ConstraintSet.TOP +import androidx.constraintlayout.widget.ConstraintSet.* import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat -import androidx.core.view.children -import androidx.core.view.doOnLayout -import androidx.core.view.isGone -import androidx.core.view.isVisible -import androidx.core.view.updateLayoutParams +import androidx.core.view.* import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer @@ -66,15 +57,13 @@ import mozilla.components.service.glean.private.NoExtras import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.android.content.res.resolveAttribute import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged +import mozilla.components.support.locale.LocaleManager import mozilla.components.ui.tabcounter.TabCounterMenu -import org.mozilla.fenix.BuildConfig -import org.mozilla.fenix.Config +import org.mozilla.fenix.* import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.HomeScreen import org.mozilla.fenix.GleanMetrics.StartOnHome import org.mozilla.fenix.GleanMetrics.Wallpapers -import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.R import org.mozilla.fenix.browser.BrowserAnimator.Companion.getToolbarNavOptions import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.components.FenixSnackbar @@ -84,12 +73,7 @@ import org.mozilla.fenix.components.appstate.AppAction import org.mozilla.fenix.components.toolbar.FenixTabCounterMenu import org.mozilla.fenix.components.toolbar.ToolbarPosition import org.mozilla.fenix.databinding.FragmentHomeBinding -import org.mozilla.fenix.ext.components -import org.mozilla.fenix.ext.hideToolbar -import org.mozilla.fenix.ext.nav -import org.mozilla.fenix.ext.requireComponents -import org.mozilla.fenix.ext.runIfFragmentIsAttached -import org.mozilla.fenix.ext.settings +import org.mozilla.fenix.ext.* import org.mozilla.fenix.gleanplumb.DefaultMessageController import org.mozilla.fenix.gleanplumb.MessagingFeature import org.mozilla.fenix.home.mozonline.showPrivacyPopWindow @@ -110,6 +94,7 @@ import org.mozilla.fenix.home.topsites.DefaultTopSitesView import org.mozilla.fenix.nimbus.FxNimbus import org.mozilla.fenix.onboarding.FenixOnboarding import org.mozilla.fenix.perf.MarkersFragmentLifecycleCallbacks +import org.mozilla.fenix.settings.advanced.getSelectedLocale import org.mozilla.fenix.tabstray.TabsTrayAccessPoint import org.mozilla.fenix.tor.bootstrap.TorQuickStart import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHOLD @@ -117,6 +102,8 @@ import org.mozilla.fenix.utils.ToolbarPopupWindow import org.mozilla.fenix.utils.allowUndo import org.mozilla.fenix.wallpapers.WallpaperManager import java.lang.ref.WeakReference +import java.util.* +import kotlin.concurrent.schedule import kotlin.math.min @Suppress("TooManyFunctions", "LargeClass") @@ -229,6 +216,13 @@ class HomeFragment : Fragment() { ?.replace(" *([.,。।]) *".toRegex(), "$1\n") ?.trim() + binding.yecPoweredbyprivacy.text = localBinding + .yecPoweredbyprivacy + .text + ?.replace(" *([.,。।]) *".toRegex(), "$1\n") + ?.trim() + + currentMode = CurrentMode( requireContext(), onboarding, @@ -411,6 +405,20 @@ class HomeFragment : Fragment() { adjustHomeFragmentView(currentMode.getCurrentMode()) showSessionControlView() + binding.donateNowButton.setOnClickListener { + val country = LocaleManager.getSelectedLocale(requireContext()).country + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (country != "") { + locale = "${locale}-${country}" + } + val localeUrl = "https://www.torproject.org/pbp-${locale}-mobile" + activity.openToBrowserAndLoad( + searchTermOrURL = localeUrl, + newTab = true, + from = BrowserDirection.FromHome + ) + } + // DO NOT MOVE ANYTHING BELOW THIS addMarker CALL! requireComponents.core.engine.profiler?.addMarker( MarkersFragmentLifecycleCallbacks.MARKER_NAME, profilerStartTime, "HomeFragment.onCreateView", @@ -424,8 +432,34 @@ class HomeFragment : Fragment() { getMenuButton()?.dismissMenu() displayWallpaperIfEnabled() + + //view.donationmatch.setOnClickListener { + // activity.openToBrowserAndLoad( + // searchTermOrURL = "https://blog.torproject.org/friends-of-tor-match-2020", + // newTab = true, + // from = BrowserDirection.FromHome + // ) + //} + + binding.donateNowButton.setOnClickListener { + val country = LocaleManager.getSelectedLocale(requireContext()).country + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (country != "") { + locale = "${locale}-${country}" + } + val localeUrl = "https://www.torproject.org/pbp-${locale}-mobile" + (activity as HomeActivity).openToBrowserAndLoad( + searchTermOrURL = localeUrl, + newTab = true, + from = BrowserDirection.FromHome + ) + } } + //private fun dismissTip(tip: Tip) { + // sessionControlInteractor.onCloseTip(tip) + //} + /** * Returns a [TopSitesConfig] which specifies how many top sites to display and whether or * not frequently visited sites should be displayed. @@ -577,14 +611,97 @@ class HomeFragment : Fragment() { } } } + val yec22launched = (activity as? HomeActivity)?.themeManager?.isYECActive ?: false + // Hide the onion pattern during Onboarding, too. binding.onionPatternImage.apply { - visibility = if (onboarding.userHasBeenOnboarded()) { + visibility = if (onboarding.userHasBeenOnboarded() && !yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide tor browser header during onboarding and EOY event + binding.exploreprivately.apply { + visibility = if (onboarding.userHasBeenOnboarded() && !yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + + + // Hide EOY header text during onboarding and before event + binding.yecPoweredbyprivacy.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + + + // Hide the EOY image during Onboarding, and before event + binding.yecActivistImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + binding.yecResistanceImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + binding.yecChangeImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + binding.yecFreedomImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide the EOY donate button during Onboarding, and before event + binding.donateNowButton.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide EOY donation match text during onboarding and before event + binding.donationmatch.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { View.VISIBLE } else { View.GONE } } + + // Hide the EOY image during Onboarding, and before event + binding.yecImageLayout.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + binding.homeAppBar.apply { visibility = View.VISIBLE @@ -932,7 +1049,11 @@ class HomeFragment : Fragment() { override fun onResume() { super.onResume() if (browsingModeManager.mode == BrowsingMode.Private) { - activity?.window?.setBackgroundDrawableResource(R.drawable.private_home_background_gradient) + if ((activity as? HomeActivity)?.themeManager?.isYECActive ?: false) { + activity?.window?.setBackgroundDrawableResource(R.color.tor_yec_home_background) + } else { + activity?.window?.setBackgroundDrawableResource(R.drawable.private_home_background_gradient) + } } // fenix#40176: Ensure the Home fragment is rendered correctly when we resume. ===================================== app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt ===================================== @@ -23,18 +23,33 @@ import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity +import org.mozilla.fenix.home.HomeFragment +import java.util.* abstract class ThemeManager { + // 1663979387091 // 2022 9 21 - testing + // 1665619200000 // 2022 10 13 + private val yec2022LaunchDate = Date(1665619200000) + // 1672531200000 // 2023 01 01 + private val yec2022EndDate = Date(1672531200000) abstract var currentTheme: BrowsingMode + val isYECActive get() = Date().after(yec2022LaunchDate) && Date().before(yec2022EndDate) + /** * Returns the style resource corresponding to the [currentTheme]. */ @get:StyleRes val currentThemeResource get() = when (currentTheme) { BrowsingMode.Normal -> R.style.NormalTheme - BrowsingMode.Private -> R.style.PrivateTheme + BrowsingMode.Private -> { + if (isYECActive) { + R.style.PrivateEOYTheme + } else { + R.style.PrivateTheme + } + } } /** ===================================== app/src/main/res/drawable/ic_yec22_bg_combined_android_3x.png ===================================== Binary files /dev/null and b/app/src/main/res/drawable/ic_yec22_bg_combined_android_3x.png differ ===================================== app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml ===================================== @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> + + + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="#C0FF00" /> + <corners android:radius="10dp" /> +</shape> ===================================== app/src/main/res/font/spacegrotesk_light.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacegrotesk_light.ttf differ ===================================== app/src/main/res/font/spacegrotesk_regular.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacegrotesk_regular.ttf differ ===================================== app/src/main/res/font/spacegrotesk_semibold.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacegrotesk_semibold.ttf differ ===================================== app/src/main/res/font/spacemono_bold.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacemono_bold.ttf differ ===================================== app/src/main/res/layout/fragment_home.xml ===================================== @@ -102,6 +102,144 @@ android:lineSpacingMultiplier="1.1" app:layout_scrollFlags="scroll" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="50dp" + android:layout_weight="1" + android:orientation="vertical"> + + <TextView + android:id="@+id/yec_poweredbyprivacy" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:layout_marginStart="35dp" + android:layout_marginEnd="35dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacemono_bold" + android:importantForAccessibility="no" + android:text="@string/yec2022_powered_by_privacy" + android:lineSpacingMultiplier="0.8" + android:textColor="#C0FF00" + android:textSize="28sp" + app:layout_scrollFlags="scroll" /> + + <RelativeLayout + android:id="@+id/yec_image_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="22dp" + android:layout_marginStart="35dp" + android:layout_marginEnd="35dp" + android:gravity="center" + android:orientation="vertical" > + + <ImageView + android:id="@+id/yec_activist_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scaleType="fitCenter" + android:paddingTop="10dp" + android:adjustViewBounds="true" + app:layout_scrollFlags="scroll" + app:srcCompat="@drawable/ic_yec22_bg_combined_android_3x" + tools:ignore="ContentDescription" /> + + <TextView + android:id="@+id/yec_resistance_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:paddingStart="80dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacegrotesk_semibold" + android:importantForAccessibility="no" + android:rotation="-2.25" + android:text="@string/yec2022_resistance" + android:textColor="#FF8AFF" + android:textSize="33sp" + app:layout_scrollFlags="scroll" /> + + <TextView + android:id="@+id/yec_change_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:paddingStart="80dp" + android:layout_alignLeft="@+id/yec_resistance_image" + android:layout_below="@+id/yec_resistance_image" + android:layout_marginTop="-10dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacegrotesk_light" + android:importantForAccessibility="no" + android:rotation="-2.25" + android:text="@string/yec2022_change" + android:textColor="#C0FF00" + android:textSize="33sp" + app:layout_scrollFlags="scroll" /> + + <TextView + android:id="@+id/yec_freedom_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:paddingStart="80dp" + android:layout_alignLeft="@+id/yec_resistance_image" + android:layout_below="@+id/yec_change_image" + android:layout_marginTop="-10dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacegrotesk_semibold" + android:importantForAccessibility="no" + android:rotation="-2.25" + android:text="@string/yec2022_freedom" + android:textColor="#FF8AFF" + android:textSize="33sp" + app:layout_scrollFlags="scroll" /> + </RelativeLayout> + + <Button + android:id="@+id/donate_now_button" + style="@style/TorDonateYecButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="35dp" + android:layout_marginRight="35dp" + android:layout_marginTop="22dp" + android:background="@drawable/tor_yec_donate_rounded_corners" + android:text="@string/tor_onboarding_donate_button" + android:textAllCaps="false" + android:textColor="#000000" + android:textSize="18sp" + android:textStyle="bold" + android:visibility="visible" + tools:ignore="ButtonStyleXmlDetector" /> + + <TextView + android:id="@+id/donationmatch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="22dp" + android:paddingStart="35dp" + android:paddingEnd="35dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacemono_bold" + android:importantForAccessibility="no" + android:lineSpacingMultiplier="1.1" + android:text="@string/yec2022_donation_matching" + android:textColor="#FAF5DF" + android:textSize="18sp" + android:gravity="center" + android:visibility="visible" + app:layout_scrollFlags="scroll" /> + + + </LinearLayout> </com.google.android.material.appbar.AppBarLayout> <androidx.recyclerview.widget.RecyclerView ===================================== app/src/main/res/values/colors.xml ===================================== @@ -273,7 +273,7 @@ <color name="sync_disconnected_background_private_theme">#5B5846</color> <color name="onboarding_illustration_deselected_private_theme">#99FBFBFE</color> <color name="prompt_login_edit_text_cursor_color_private_theme">@color/photonViolet50</color> - + <color name="tor_yec_home_background">#0E0625</color>  <color name="accent_normal_theme">@color/photonInk20</color> <color name="accent_high_contrast_normal_theme">@color/photonInk20</color> ===================================== app/src/main/res/values/styles.xml ===================================== @@ -330,6 +330,11 @@ <style name="PrivateTheme" parent="PrivateThemeBase" /> + <style name="PrivateEOYTheme" parent="PrivateThemeBase" > + <item name="android:windowBackground">@color/tor_yec_home_background</item> + <item name="homeBackground">@color/tor_yec_home_background</item> + </style> +  <style name="WindowAnimationTransition"> <item name="android:windowEnterAnimation">@anim/fade_in</item> @@ -368,6 +373,21 @@ <item name="android:textColor">#000000</item> </style> + + <style name="TorDonateYecButton" parent="NeutralButton"> + <item name="android:background">@drawable/tor_yec_donate_rounded_corners</item> + <item name="backgroundTint">#C0FF00</item> + <item name="android:textColor">#000000</item> + <item name="android:fontFamily">@font/spacemono_bold</item> + <item name="fontFamily">@font/spacemono_bold</item> + </style> + + <style name="TorDonateYecButtonText" parent="Base.TextAppearance.MaterialComponents.Badge"> + + <item name="android:textStyle">bold</item> + <item name="android:textColor">#000000</item> + </style> + <style name="DestructiveButton" parent="NeutralButton"> <item name="iconTint">@color/fx_mobile_text_color_warning</item> <item name="android:textColor">@color/fx_mobile_text_color_warning</item> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/f9aea110ce4f4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/f9aea110ce4f4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[builders/tor-browser-build] annotated tag tbb-12.0a5-build1 created (now c796c944)
by gitolite role 30 Nov '22

30 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to annotated tag tbb-12.0a5-build1 in repository builders/tor-browser-build. at c796c944 (tag) tagging 73d8f5d88343aea9a59e3c97b2811014db6cbaa0 (commit) replaces tbb-12.0a4-build1 by Pier Angelo Vendrame on Wed Nov 30 21:57:56 2022 +0000 - Log ----------------------------------------------------------------- Tagging build1 for 12.0a5 -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQCHOE9KLO2f598e8HwdW0XkBKIkQUCY4fR5AAKCRDwdW0XkBKI kT44AP9JiyRenv8rQUmDFtsq4dN5fVsJN0+OUrVd6Ym7zS5gSwD/f26ofQgW5RNb mpwX8/VRfQ2LzUqOBZtZ7U1CnFhOKg8= =r5Hw -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated (985fe814 -> 73d8f5d8)
by gitolite role 30 Nov '22

30 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch main in repository builders/tor-browser-build. from 985fe814 Bug 40699: Fix input_files in projects/firefox-l10n/config new ca328865 Bug 41473: Add Albanian to locales new 73d8f5d8 Bug 40668: Prepare alpha release 12.0a5 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: projects/android-components/config | 2 +- projects/browser/Bundle-Data/Docs/ChangeLog.txt | 121 +++++++++++++- projects/browser/allowed_addons.json | 213 ++++++++++++------------ projects/browser/config | 4 +- projects/fenix/config | 2 +- projects/firefox/config | 6 +- projects/geckoview/config | 4 +- projects/go/config | 4 +- projects/manual/config | 4 +- projects/openssl/config | 4 +- projects/tba-translation/config | 2 +- projects/tor-android-service/config | 2 +- projects/tor/config | 2 +- projects/translation-base-browser-fluent/config | 2 +- projects/translation-base-browser/config | 2 +- rbm.conf | 6 +- 16 files changed, 246 insertions(+), 134 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser] annotated tag tor-browser-102.5.0esr-12.0-1-build4 created (now 4f6b1dc9ea53)
by gitolite role 30 Nov '22

30 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to annotated tag tor-browser-102.5.0esr-12.0-1-build4 in repository tor-browser. at 4f6b1dc9ea53 (tag) tagging c7aeef1139f0bdfc42174b400daef215663f0386 (commit) replaces tor-browser-102.5.0esr-12.0-1-build3 by Pier Angelo Vendrame on Wed Nov 30 12:54:55 2022 +0100 - Log ----------------------------------------------------------------- Tagging build4 for 102.0.5esr-based alpha -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQCHOE9KLO2f598e8HwdW0XkBKIkQUCY4dEjwAKCRDwdW0XkBKI kalEAPwNsI0CqknfYcumMkdKiN8RCKC9kCPmaU8HIj9jbj0WGAD+NwpOkSKb98JF rDB5ku1VNO3BCp00r94FJIU6hTvqTAc= =0cCI -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.5.0esr-12.0-1 updated: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gitolite role 30 Nov '22

30 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.5.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.5.0esr-12.0-1 by this push: new c7aeef1139f0 fixup! Bug 10760: Integrate TorButton to TorBrowser core c7aeef1139f0 is described below commit c7aeef1139f0bdfc42174b400daef215663f0386 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Wed Nov 30 12:37:40 2022 +0100 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41498: The Help panel is empty in 12.0a4 Forgot to remove a closing comment that was in a macOS ifdef. --- browser/base/content/browser-menubar.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index eaf4aeb4a68c..cde4d205b763 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -478,7 +478,7 @@ data-l10n-id="menu-get-help" appmenu-data-l10n-id="appmenu-get-help" #ifdef XP_MACOSX - key="key_openHelpMac"/> --> + key="key_openHelpMac"/> #else /> #endif -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] annotated tag tor-browser-102.5.0esr-12.0-1-build3 created (now cd93308e4df0)
by gitolite role 30 Nov '22

30 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to annotated tag tor-browser-102.5.0esr-12.0-1-build3 in repository tor-browser. at cd93308e4df0 (tag) tagging 4979c9b24fb77d5e107aec25362c6d6713bb0129 (commit) replaces tor-browser-102.5.0esr-12.0-1-build2 by Pier Angelo Vendrame on Wed Nov 30 12:26:00 2022 +0100 - Log ----------------------------------------------------------------- Tagging build3 for 102.0.5esr-based alpha -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQCHOE9KLO2f598e8HwdW0XkBKIkQUCY4c9yAAKCRDwdW0XkBKI kdMUAPwNj1HJww/F9xWGESDjWO+hOHQ75JXQ6I4COi9ZR5pc2gEA0l1EEr+RM0oE 6PQgthMbligWtNza4xiybfBAFnG88wg= =dSED -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.5.0esr-12.0-1 updated: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gitolite role 30 Nov '22

30 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.5.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.5.0esr-12.0-1 by this push: new 4979c9b24fb7 fixup! Bug 10760: Integrate TorButton to TorBrowser core 4979c9b24fb7 is described below commit 4979c9b24fb77d5e107aec25362c6d6713bb0129 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Wed Nov 30 12:23:00 2022 +0100 fixup! Bug 10760: Integrate TorButton to TorBrowser core Updated the submodule for the Albanian support. --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 5e6353832389..a75f1b351dac 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 5e6353832389106713311ec96570420ca5563c0b +Subproject commit a75f1b351dac1f22aabeb3f8e440b7b57fd8a1f8 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.5.0esr-12.0-1 updated: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gitolite role 30 Nov '22

30 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.5.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.5.0esr-12.0-1 by this push: new 3bdd401b684a fixup! Bug 10760: Integrate TorButton to TorBrowser core 3bdd401b684a is described below commit 3bdd401b684aac0e7b53a1ea0739bf8736b67b38 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Wed Nov 30 11:45:28 2022 +0100 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41498: The Help panel is empty in 12.0a4 --- browser/base/content/browser-menubar.inc | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index dad713362661..eaf4aeb4a68c 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -472,44 +472,48 @@ label="&aboutTor.torbrowser_user_manual.label;" accesskey="&aboutTor.torbrowser_user_manual.accesskey;"/>  -  #else - /> --> + /> #endif -  -  -  + appmenu-data-l10n-id="appmenu-help-more-troubleshooting-info"/> <menuitem id="help_reportSiteIssue" oncommand="ReportSiteIssue();" data-l10n-id="menu-help-report-site-issue" appmenu-data-l10n-id="appmenu-help-report-site-issue" hidden="true"/> -  -  + hidden="true"/> <menuseparator id="aboutSeparator"/> <menuitem id="aboutName" oncommand="openAboutDialog();" -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.5.0esr-12.0-1 updated: fixup! Firefox preference overrides.
by gitolite role 30 Nov '22

30 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.5.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.5.0esr-12.0-1 by this push: new 731f7358532f fixup! Firefox preference overrides. 731f7358532f is described below commit 731f7358532f91ea7ec1cd3ddc8c427146fe81f4 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Nov 28 17:42:26 2022 +0100 fixup! Firefox preference overrides. Added a few documentation comments --- browser/app/profile/001-base-profile.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/001-base-profile.js b/browser/app/profile/001-base-profile.js index bfeadbbbe305..ffae2f883289 100644 --- a/browser/app/profile/001-base-profile.js +++ b/browser/app/profile/001-base-profile.js @@ -225,7 +225,13 @@ pref("dom.push.enabled", false); // Fingerprinting pref("privacy.resistFingerprinting", true); +// tor-browser#18603: failIfMajorPerformanceCaveat is an optional attribute that +// can be used when creating a WebGL context if the browser detects that the +// performance would be low. That could be used to fingerpting users with a not +// good graphics card, so disable it (actually, defense in depth, it is already +// disabled by default from Firefox). pref("webgl.disable-fail-if-major-performance-caveat", true); +// tor-browser#16404: disable until we investigate it further (#22333) pref("webgl.enable-webgl2", false); pref("browser.startup.homepage_override.buildID", "20100101"); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) @@ -271,7 +277,8 @@ pref("browser.display.use_system_colors", false); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation -pref("privacy.partition.network_state", false); // Disable for now until audit +// tor-browser#40123 and #40308: Disable for now until audit +pref("privacy.partition.network_state", false); pref("network.cookie.cookieBehavior", 1); pref("network.cookie.cookieBehavior.pbmode", 1); pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633 @@ -280,7 +287,9 @@ pref("network.http.speculative-parallel-limit", 0); pref("browser.places.speculativeConnect.enabled", false); pref("network.prefetch-next", false); pref("browser.urlbar.speculativeConnect.enabled", false); -// Bug 40220: Make sure tracker cookie purging is disabled +// Bug 40220: Make sure tracker cookie purging is disabled. +// It depends on Firefox's tracking protection, which we currently do not enable +// See also tor-browser#30939. pref("privacy.purge_trackers.enabled", false); // Do not allow cross-origin sub-resources to open HTTP authentication // credentials dialogs. Hardens against potential credentials phishing. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.5.0esr-12.0-1 updated: fixup! Firefox preference overrides.
by gitolite role 30 Nov '22

30 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.5.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.5.0esr-12.0-1 by this push: new f9051f13fb2b fixup! Firefox preference overrides. f9051f13fb2b is described below commit f9051f13fb2b29c673ceb8790bf8287e0ed515bb Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Nov 22 11:49:31 2022 +0100 fixup! Firefox preference overrides. Bug 23451: Use PingFang for Chinese in macOS --- browser/app/profile/001-base-profile.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/001-base-profile.js b/browser/app/profile/001-base-profile.js index eb2fb6ce458e..bfeadbbbe305 100644 --- a/browser/app/profile/001-base-profile.js +++ b/browser/app/profile/001-base-profile.js @@ -465,7 +465,7 @@ pref("browser.taskbar.lists.recent.enabled", false); pref("gfx.bundled-fonts.activate", 1); #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, STHeiti, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Abor [...] +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Beng [...] // Armenian pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New Roman"); @@ -479,6 +479,18 @@ pref("font.name-list.monospace.x-beng", "Noto Sans Bengali, Menlo, Courier New") pref("font.name-list.serif.x-cans", "Noto Serif Canadian Aboriginal, Times, Times New Roman"); pref("font.name-list.sans-serif.x-cans", "Noto Sans Canadian Aboriginal, Helvetica, Arial"); pref("font.name-list.monospace.x-cans", "Noto Sans Canadian Aboriginal, Menlo, Courier New"); +// ChineseCN +pref("font.name-list.serif.zh-CN", "Songti SC, Times, Times New Roman"); +pref("font.name-list.sans-serif.zh-CN", "PingFang SC, Helvetica, Arial"); +pref("font.name-list.monospace.zh-CN", "PingFang SC, Menlo, Courier New"); +// ChineseHK +pref("font.name-list.serif.zh-HK", "Songti TC, Times, Times New Roman"); +pref("font.name-list.sans-serif.zh-HK", "PingFang HK, Helvetica, Arial"); +pref("font.name-list.monospace.zh-HK", "PingFang HK, Menlo, Courier New"); +// ChineseTW +pref("font.name-list.serif.zh-TW", "Songti TC, Times, Times New Roman"); +pref("font.name-list.sans-serif.zh-TW", "PingFang TC, Helvetica, Arial"); +pref("font.name-list.monospace.zh-TW", "PingFang TC, Menlo, Courier New"); // Devanagari pref("font.name-list.serif.x-devanagari", "Noto Serif Devanagari, Times, Times New Roman"); pref("font.name-list.sans-serif.x-devanagari", "Noto Sans Devanagari, Helvetica, Arial"); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0