Merge pull request #1337 from brave/fix-2888-2

Maintains Ads UI preference

Author: ryanml

browser/ui/webui/brave_rewards_ui.cc

@@ -610,7 +610,22 @@ void RewardsDOMHandler::SaveSetting(const base::ListValue* args) {
     args->GetString(1, &value);
 
     if (key == "enabledMain") {
-      rewards_service_->SetRewardsMainEnabled(value == "true");
+      bool rewards_enabled = (value == "true");
+
+      if (ads_service_) {
+        if (rewards_enabled) {
+          // When Rewards are enabled, set Ads enabled to whatever UI value is
+          bool ads_ui_enabled = ads_service_->is_ui_enabled();
+          ads_service_->set_ads_enabled(ads_ui_enabled);
+        } else {
+          // When Rewards are disabled, cache UI value and disable Ads
+          bool ads_enabled = ads_service_->is_enabled();
+          ads_service_->set_ads_ui_enabled(ads_enabled);
+          ads_service_->set_ads_enabled(rewards_enabled);
+        }
+      }
+
+      rewards_service_->SetRewardsMainEnabled(rewards_enabled);
     }
 
     if (key == "contributionMonthly") {
@@ -809,7 +824,7 @@ void RewardsDOMHandler::GetAdsData(const base::ListValue *args) {
     base::DictionaryValue adsData;
 
     bool ads_ui_enabled;
-    bool ads_enabled = ads_service_->is_enabled();
+    bool ads_enabled = ads_service_->is_ui_enabled();
     int ads_per_hour = ads_service_->ads_per_hour();
 
     #if BUILDFLAG(BRAVE_ADS_ENABLED)
@@ -835,6 +850,7 @@ void RewardsDOMHandler::SaveAdsSetting(const base::ListValue* args) {
 
     if (key == "adsEnabled") {
       ads_service_->set_ads_enabled(value == "true");
+      ads_service_->set_ads_ui_enabled(value == "true");
     }
 
     if (key == "adsPerHour") {

components/brave_ads/browser/ads_service.h

@@ -18,9 +18,11 @@ class AdsService : public KeyedService {
   AdsService() = default;
 
   virtual bool is_enabled() const = 0;
+  virtual bool is_ui_enabled() const = 0;
   virtual uint64_t ads_per_hour() const = 0;
 
   virtual void set_ads_enabled(bool enabled) = 0;
+  virtual void set_ads_ui_enabled(bool enabled) = 0;
   virtual void set_ads_per_hour(int ads_per_hour) = 0;
 
   // ads::Ads proxy

components/brave_ads/browser/ads_service_factory.cc

@@ -75,6 +75,7 @@ bool AdsServiceFactory::ServiceIsNULLWhileTesting() const {
 void AdsServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kBraveAdsEnabled, false);
+  registry->RegisterBooleanPref(prefs::kBraveAdsUIEnabled, false);
   registry->RegisterUint64Pref(prefs::kBraveAdsPerHour, 2);
   registry->RegisterUint64Pref(prefs::kBraveAdsPerDay, 6);
   registry->RegisterIntegerPref(prefs::kBraveAdsIdleThreshold, 15);

components/brave_ads/browser/ads_service_impl.cc

@@ -444,6 +444,10 @@ bool AdsServiceImpl::is_enabled() const {
   return profile_->GetPrefs()->GetBoolean(prefs::kBraveAdsEnabled);
 }
 
+bool AdsServiceImpl::is_ui_enabled() const {
+  return profile_->GetPrefs()->GetBoolean(prefs::kBraveAdsUIEnabled);
+}
+
 bool AdsServiceImpl::IsAdsEnabled() const {
   return is_enabled();
 }
@@ -452,6 +456,10 @@ void AdsServiceImpl::set_ads_enabled(bool enabled) {
   profile_->GetPrefs()->SetBoolean(prefs::kBraveAdsEnabled, enabled);
 }
 
+void AdsServiceImpl::set_ads_ui_enabled(bool enabled) {
+  profile_->GetPrefs()->SetBoolean(prefs::kBraveAdsUIEnabled, enabled);
+}
+
 void AdsServiceImpl::set_ads_per_hour(int ads_per_hour) {
   profile_->GetPrefs()->SetUint64(prefs::kBraveAdsPerHour, ads_per_hour);
 }

components/brave_ads/browser/ads_service_impl.h

@@ -52,9 +52,11 @@ class AdsServiceImpl : public AdsService,
 
   // AdsService implementation
   bool is_enabled() const override;
+  bool is_ui_enabled() const override;
   uint64_t ads_per_hour() const override;
 
   void set_ads_enabled(bool enabled) override;
+  void set_ads_ui_enabled(bool enabled) override;
   void set_ads_per_hour(int ads_per_hour) override;
 
   void TabUpdated(

components/brave_ads/common/pref_names.cc

@@ -8,6 +8,7 @@ namespace brave_ads {
 namespace prefs {
 
 const char kBraveAdsEnabled[] = "brave.brave_ads.enabled";
+const char kBraveAdsUIEnabled[] = "brave.brave_ads_ui_enabled";
 const char kBraveAdsPerHour[] = "brave.brave_ads.ads_per_hour";
 const char kBraveAdsPerDay[] = "brave.brave_ads.ads_per_day";
 const char kBraveAdsIdleThreshold[] = "brave.brave_ads.idle_threshold";

components/brave_ads/common/pref_names.h

@@ -9,6 +9,7 @@ namespace brave_ads {
 namespace prefs {
 
 extern const char kBraveAdsEnabled[];
+extern const char kBraveAdsUIEnabled[];
 extern const char kBraveAdsPerHour[];
 extern const char kBraveAdsPerDay[];
 extern const char kBraveAdsIdleThreshold[];