From 824d5976cfbd547e12cf24db98c245c8f18c83db Mon Sep 17 00:00:00 2001 From: Serg Date: Wed, 6 May 2026 17:18:17 -0400 Subject: [PATCH] [Android] Hide NTP ad settings when Rewards is disabled by policy (#36224) Hides the "Show New Tab Page Ads" toggle and the "Learn more about new tab page ads" link in Settings -> New Tab Page when Brave Rewards is disabled by policy. Both controls remain visible and functional otherwise. Also switches BackgroundImagesPreferences to retrieve the profile via the inherited getProfile() instead of the legacy ProfileManager.getLastUsedRegularProfile(). Resolves: https://github.com/brave/brave-browser/issues/55312 --- .../settings/BackgroundImagesPreferences.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java b/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java index 6bb4595242e..f19ab9bacaa 100644 --- a/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java @@ -22,12 +22,12 @@ import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRelaunchUtils; +import org.chromium.chrome.browser.BraveRewardsPolicy; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.ntp.BraveFreshNtpHelper; import org.chromium.chrome.browser.ntp.NtpUtil; import org.chromium.chrome.browser.preferences.BravePref; import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; -import org.chromium.chrome.browser.profiles.ProfileManager; import org.chromium.chrome.browser.util.TabUtils; import org.chromium.components.browser_ui.settings.ChromeBasePreference; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; @@ -78,25 +78,30 @@ public class BackgroundImagesPreferences extends BravePreferenceFragment if (mShowBackgroundImagesPref != null) { mShowBackgroundImagesPref.setEnabled(true); mShowBackgroundImagesPref.setChecked( - UserPrefs.get(ProfileManager.getLastUsedRegularProfile()) + UserPrefs.get(getProfile()) .getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE)); mShowBackgroundImagesPref.setOnPreferenceChangeListener(this); } + boolean rewardsDisabledByPolicy = BraveRewardsPolicy.isDisabledByPolicy(getProfile()); mShowSponsoredImagesPref = (ChromeSwitchPreference) findPreference(PREF_SHOW_SPONSORED_IMAGES); - if (mShowSponsoredImagesPref != null) { + if (mShowSponsoredImagesPref != null && rewardsDisabledByPolicy) { + mShowSponsoredImagesPref.setVisible(false); + } else if (mShowSponsoredImagesPref != null) { mShowSponsoredImagesPref.setEnabled( - UserPrefs.get(ProfileManager.getLastUsedRegularProfile()) + UserPrefs.get(getProfile()) .getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE)); mShowSponsoredImagesPref.setChecked( - UserPrefs.get(ProfileManager.getLastUsedRegularProfile()) + UserPrefs.get(getProfile()) .getBoolean( BravePref.NEW_TAB_PAGE_SHOW_SPONSORED_IMAGES_BACKGROUND_IMAGE)); mShowSponsoredImagesPref.setOnPreferenceChangeListener(this); } mLearnMorePreference = (ChromeBasePreference) findPreference(PREF_SPONSORED_IMAGES_LEARN_MORE); - if (mLearnMorePreference != null) { + if (mLearnMorePreference != null && rewardsDisabledByPolicy) { + mLearnMorePreference.setVisible(false); + } else if (mLearnMorePreference != null) { SpannableString spannableString = new SpannableString( getContext().getString(R.string.sponsored_images_learn_more)); @@ -171,11 +176,11 @@ public class BackgroundImagesPreferences extends BravePreferenceFragment if (mShowSponsoredImagesPref != null) { mShowSponsoredImagesPref.setEnabled((boolean) newValue); } - UserPrefs.get(ProfileManager.getLastUsedRegularProfile()) + UserPrefs.get(getProfile()) .setBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE, (boolean) newValue); BraveRelaunchUtils.askForRelaunch(getActivity()); } else if (PREF_SHOW_SPONSORED_IMAGES.equals(key)) { - UserPrefs.get(ProfileManager.getLastUsedRegularProfile()) + UserPrefs.get(getProfile()) .setBoolean( BravePref.NEW_TAB_PAGE_SHOW_SPONSORED_IMAGES_BACKGROUND_IMAGE, (boolean) newValue);