Fixes brave/brave-browser#4339, resolves migration issues for Ads ena…

…bled
brave · May 17, 2019 · cfb6880 · cfb6880
1 parent 0841a81
commit cfb6880
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 0 deletions.
diff --git a/browser/ui/webui/brave_rewards_ui.cc b/browser/ui/webui/brave_rewards_ui.cc
@@ -927,6 +927,8 @@ void RewardsDOMHandler::SaveAdsSetting(const base::ListValue* args) {
  ads_service_->SetAdsEnabled(value == "true");
  } else if (key == "adsPerHour") {
  ads_service_->SetAdsPerHour(std::stoull(value));
+ } else if (key == "adsEnabledMigrated") {
+ ads_service_->MigrateAdsEnabled(value == "true");
  }
 
  base::ListValue* emptyArgs = nullptr;

diff --git a/components/brave_ads/browser/ads_service.h b/components/brave_ads/browser/ads_service.h
@@ -26,6 +26,7 @@ class AdsService : public KeyedService {
 
  virtual bool IsAdsEnabled() const = 0;
  virtual void SetAdsEnabled(const bool is_enabled) = 0;
+ virtual void MigrateAdsEnabled(const bool is_enabled) = 0;
 
  virtual uint64_t GetAdsPerHour() const = 0;
  virtual void SetAdsPerHour(const uint64_t ads_per_hour) = 0;

diff --git a/components/brave_ads/browser/ads_service_factory.cc b/components/brave_ads/browser/ads_service_factory.cc
@@ -96,6 +96,7 @@ void AdsServiceFactory::RegisterProfilePrefs(
  }
 
  registry->RegisterBooleanPref(prefs::kBraveAdsEnabled, false);
+ registry->RegisterBooleanPref(prefs::kBraveAdsEnabledMigrated, false);
 
  registry->RegisterUint64Pref(prefs::kBraveAdsPerHour, 2);
 

diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc
@@ -802,6 +802,17 @@ void AdsServiceImpl::SetAdsEnabled(const bool is_enabled) {
  profile_->GetPrefs()->SetBoolean(prefs::kBraveAdsEnabled, is_enabled);
 }
 
+void AdsServiceImpl::MigrateAdsEnabled(const bool is_enabled) {
+ if (profile_->GetPrefs()->GetBoolean(
+ prefs::kBraveAdsEnabledMigrated)) {
+ return;
+ }
+
+ SetAdsEnabled(is_enabled);
+
+ profile_->GetPrefs()->SetBoolean(prefs::kBraveAdsEnabledMigrated, true);
+}
+
 uint64_t AdsServiceImpl::GetAdsPerHour() const {
  return profile_->GetPrefs()->GetUint64(prefs::kBraveAdsPerHour);
 }

diff --git a/components/brave_ads/browser/ads_service_impl.h b/components/brave_ads/browser/ads_service_impl.h
@@ -65,6 +65,7 @@ class AdsServiceImpl : public AdsService,
  bool IsSupportedRegion() const override;
 
  void SetAdsEnabled(const bool is_enabled) override;
+ void MigrateAdsEnabled(const bool is_enabled) override;
 
  void SetAdsPerHour(const uint64_t ads_per_hour) override;
 

diff --git a/components/brave_ads/common/pref_names.cc b/components/brave_ads/common/pref_names.cc
@@ -27,6 +27,8 @@ const int kBraveAdsPrefsCurrentVersion = 2;
 const char kBraveAdsPrefsVersion[] = "brave.brave_ads.prefs.version";
 const char kBraveAdsPrefsMigratedFrom62[] =
  "brave.brave_ads.prefs.migrated.from_0_62.x";
+const char kBraveAdsEnabledMigrated[] =
+ "brave.brave_ads.prefs.enabled_migrated";
 
 } // namespace prefs
 

diff --git a/components/brave_ads/common/pref_names.h b/components/brave_ads/common/pref_names.h
@@ -23,6 +23,7 @@ extern const int kBraveAdsPrefsDefaultVersion;
 extern const int kBraveAdsPrefsCurrentVersion;
 extern const char kBraveAdsPrefsVersion[];
 extern const char kBraveAdsPrefsMigratedFrom62[];
+extern const char kBraveAdsEnabledMigrated[];
 
 } // namespace prefs
 

diff --git a/components/brave_rewards/resources/ui/components/app.tsx b/components/brave_rewards/resources/ui/components/app.tsx
@@ -32,6 +32,15 @@ export class App extends React.Component<Props, State> {
  if (!this.props.rewardsData.walletCreated) {
  this.actions.checkWalletExistence()
  }
+
+ if (this.props.rewardsData.enabledMain &&
+ !this.props.rewardsData.enabledAdsMigrated) {
+ const { adsEnabled, adsIsSupported } = this.props.rewardsData.adsData
+
+ if (adsIsSupported) {
+ this.props.actions.onAdsSettingSave('adsEnabledMigrated', adsEnabled)
+ }
+ }
  }
 
  componentDidUpdate (prevProps: Props, prevState: State) {

diff --git a/components/brave_rewards/resources/ui/reducers/rewards_reducer.ts b/components/brave_rewards/resources/ui/reducers/rewards_reducer.ts
@@ -137,6 +137,10 @@ const rewardsReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State
  if (key) {
  state[key] = value
  chrome.send('brave_rewards.saveAdsSetting', [key, value.toString()])
+
+ if (key === 'adsEnabledMigrated') {
+ state.enabledAdsMigrated = true
+ }
  }
  break
  }

diff --git a/components/brave_rewards/resources/ui/storage.ts b/components/brave_rewards/resources/ui/storage.ts
@@ -11,6 +11,7 @@ export const defaultState: Rewards.State = {
  createdTimestamp: null,
  enabledMain: false,
  enabledAds: true,
+ enabledAdsMigrated: false,
  enabledContribute: true,
  firstLoad: null,
  walletCreated: false,

diff --git a/components/definitions/rewards.d.ts b/components/definitions/rewards.d.ts
@@ -39,6 +39,7 @@ declare namespace Rewards {
  donationAbilityTwitter: boolean
  donationAbilityYT: boolean
  enabledAds: boolean
+ enabledAdsMigrated: boolean
  enabledContribute: boolean
  enabledMain: boolean
  firstLoad: boolean | null