tor-browser

commit 2dfcbafdab537e8bcc8f088dff1bd39cac446f2f
parent 69623bd6652dbd9e98aa20e4307caa0476b0d7ab
Author: John Oberhauser <j.git-global@obez.io>
Date:   Wed, 17 Dec 2025 23:47:12 +0000

Bug 2006696 - Updating the SupportUtils privacy notice enum names r=android-reviewers,gmalekpour

Differential Revision: https://phabricator.services.mozilla.com/D276869

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
 | 
2
+-
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/termsofuse/PrivacyNoticeBanner.kt
 | 
4
++--
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/messaging/MicrosurveyMessageController.kt
 | 
2
+-
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/DefaultOnboardingTermsOfServiceEventHandler.kt
 | 
2
+-
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt
 | 
2
+-
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
 | 
6
+++---
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
 | 
2
+-
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/termsofuse/ui/TermsOfUseBottomSheetFragment.kt
 | 
2
+-
M
mobile/android/fenix/app/src/test/java/org/mozilla/fenix/messaging/MicrosurveyMessageControllerTest.kt
 | 
2
+-
M
mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt
 | 
2
+-

10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -2524,7 +2524,7 @@ abstract class BaseBrowserFragment :
         private const val LAST_SAVED_GENERATED_PASSWORD = "last_saved_generated_password"
 
         val onboardingLinksList: List<String> = listOf(
-            SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE),
+            SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVACY_NOTICE),
             SupportUtils.FXACCOUNT_SUMO_URL,
         )
     }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/termsofuse/PrivacyNoticeBanner.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/termsofuse/PrivacyNoticeBanner.kt
@@ -50,7 +50,7 @@ fun PrivacyNoticeBanner(
                 linkTextStates = listOf(
                     LinkTextState(
                         text = stringResource(R.string.privacy_notice_updated_homepage_message_privacy_notice),
-                        url = SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE_NEXT),
+                        url = SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVACY_NOTICE_NEXT),
                         onClick = { url ->
                             interactor.onPrivacyNoticeBannerPrivacyNoticeClicked()
                             SupportUtils.launchSandboxCustomTab(
@@ -61,7 +61,7 @@ fun PrivacyNoticeBanner(
                     ),
                     LinkTextState(
                         text = stringResource(R.string.privacy_notice_updated_homepage_message_learn_more),
-                        url = SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE_UPDATE),
+                        url = SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVACY_NOTICE_UPDATE),
                         onClick = { url ->
                             interactor.onPrivacyNoticeBannerLearnMoreClicked()
                             SupportUtils.launchSandboxCustomTab(
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/messaging/MicrosurveyMessageController.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/messaging/MicrosurveyMessageController.kt
@@ -17,7 +17,7 @@ import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.Microsurv
 import org.mozilla.fenix.settings.SupportUtils
 
 private val PRIVACY_POLICY_URL =
-    SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE) +
+    SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVACY_NOTICE) +
         "?utm_medium=firefox-mobile&utm_source=modal&utm_campaign=microsurvey"
 
 /**
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/DefaultOnboardingTermsOfServiceEventHandler.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/DefaultOnboardingTermsOfServiceEventHandler.kt
@@ -33,7 +33,7 @@ class DefaultOnboardingTermsOfServiceEventHandler(
         telemetryRecorder.onTermsOfServicePrivacyNoticeLinkClick()
         openLink(
             url.trim().ifNullOrEmpty {
-                SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE)
+                SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVACY_NOTICE)
             },
         )
     }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt
@@ -518,7 +518,7 @@ class OnboardingFragment : Fragment() {
             text = getString(R.string.juno_onboarding_privacy_notice_text),
             linkTextState = LinkTextState(
                 text = getString(R.string.juno_onboarding_privacy_notice_text),
-                url = SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE),
+                url = SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVACY_NOTICE),
                 onClick = {
                     SupportUtils.launchSandboxCustomTab(
                         context = requireContext(),
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
@@ -77,9 +77,9 @@ object SupportUtils {
     }
 
     enum class MozillaPage(internal val path: String) {
-        PRIVATE_NOTICE("privacy/firefox/"),
-        PRIVATE_NOTICE_UPDATE("${PRIVATE_NOTICE.path}update/"),
-        PRIVATE_NOTICE_NEXT("${PRIVATE_NOTICE.path}next/"),
+        PRIVACY_NOTICE("privacy/firefox/"),
+        PRIVACY_NOTICE_UPDATE("${PRIVACY_NOTICE.path}update/"),
+        PRIVACY_NOTICE_NEXT("${PRIVACY_NOTICE.path}next/"),
         MANIFESTO("about/manifesto/"),
         TERMS_OF_SERVICE("about/legal/terms/firefox/"),
     }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
@@ -219,7 +219,7 @@ class AboutFragment(
             AboutPageItem(
                 AboutItem.ExternalLink(
                     PRIVACY_NOTICE,
-                    SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE),
+                    SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVACY_NOTICE),
                 ),
                 getString(R.string.about_privacy_notice),
             ),
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/termsofuse/ui/TermsOfUseBottomSheetFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/termsofuse/ui/TermsOfUseBottomSheetFragment.kt
@@ -96,7 +96,7 @@ class TermsOfUseBottomSheetFragment : BottomSheetDialogFragment() {
                         )
                         SupportUtils.launchSandboxCustomTab(
                             context,
-                            SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE),
+                            SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVACY_NOTICE),
                         )
                     },
                     onLearnMoreClicked = {
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/messaging/MicrosurveyMessageControllerTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/messaging/MicrosurveyMessageControllerTest.kt
@@ -27,7 +27,7 @@ import org.mozilla.fenix.settings.SupportUtils
 import org.robolectric.RobolectricTestRunner
 
 private val PRIVACY_POLICY_URL =
-    SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE) +
+    SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVACY_NOTICE) +
         "?utm_medium=firefox-mobile&utm_source=modal&utm_campaign=microsurvey"
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt
@@ -68,7 +68,7 @@ class SupportUtilsTest {
         )
         assertEquals(
             "https://www.mozilla.org/zh/privacy/firefox/",
-            SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE, Locale.forLanguageTag("zh")),
+            SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVACY_NOTICE, Locale.forLanguageTag("zh")),
         )
     }