Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes issue with ads per day incorrectly limited to ads per hour #7454

Merged
merged 1 commit into from
Dec 16, 2020
+16 −7
Merged

Fixes issue with ads per day incorrectly limited to ads per hour #7454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/brave_ads/browser/ads_service.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void AdsService::RegisterProfilePrefs(
registry->RegisterUint64Pref(
ads::prefs::kAdsPerHour, 2);
registry->RegisterUint64Pref(
ads::prefs::kAdsPerDay, 20);
ads::prefs::kAdsPerDay, 40);

registry->RegisterIntegerPref(
ads::prefs::kIdleThreshold, 15);
Expand Down
12 changes: 10 additions & 2 deletions components/brave_ads/browser/ads_service_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ uint64_t AdsServiceImpl::GetAdsPerHour() const {

uint64_t AdsServiceImpl::GetAdsPerDay() const {
return base::ClampToRange(GetUint64Pref(ads::prefs::kAdsPerDay),
static_cast<uint64_t>(1), static_cast<uint64_t>(20));
static_cast<uint64_t>(1), static_cast<uint64_t>(40));
}

bool AdsServiceImpl::ShouldAllowAdsSubdivisionTargeting() const {
Expand Down Expand Up @@ -1342,7 +1342,8 @@ bool AdsServiceImpl::MigratePrefs(
{{4, 5}, &AdsServiceImpl::MigratePrefsVersion4To5},
{{5, 6}, &AdsServiceImpl::MigratePrefsVersion5To6},
{{6, 7}, &AdsServiceImpl::MigratePrefsVersion6To7},
{{7, 8}, &AdsServiceImpl::MigratePrefsVersion7To8}
{{7, 8}, &AdsServiceImpl::MigratePrefsVersion7To8},
{{8, 9}, &AdsServiceImpl::MigratePrefsVersion8To9}
};

// Cycle through migration paths, i.e. if upgrading from version 2 to 5 we
Expand Down Expand Up @@ -1553,6 +1554,13 @@ void AdsServiceImpl::MigratePrefsVersion7To8() {
}
}

void AdsServiceImpl::MigratePrefsVersion8To9() {
// Unlike Muon, ads per day are not configurable in the UI so we can safely
// migrate to the new value

SetUint64Pref(ads::prefs::kAdsPerDay, 40);
}

int AdsServiceImpl::GetPrefsVersion() const {
return GetIntegerPref(prefs::kVersion);
}
Expand Down
1 change: 1 addition & 0 deletions components/brave_ads/browser/ads_service_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ class AdsServiceImpl : public AdsService,
void MigratePrefsVersion5To6();
void MigratePrefsVersion6To7();
void MigratePrefsVersion7To8();
void MigratePrefsVersion8To9();
int GetPrefsVersion() const;

bool IsUpgradingFromPreBraveAdsBuild();
Expand Down
2 changes: 1 addition & 1 deletion components/brave_ads/common/pref_names.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const int kSupportedCountryCodesSchemaVersionNumber = 9;
// Stores the preferences version number
const char kVersion[] = "brave.brave_ads.prefs.version";

const int kCurrentVersionNumber = 8;
const int kCurrentVersionNumber = 9;

} // namespace prefs

Expand Down
2 changes: 1 addition & 1 deletion ...-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ bool AdsPerDayFrequencyCap::DoesRespectCap(
base::Time::kHoursPerDay;

const uint64_t cap =
AdsClientHelper::Get()->GetUint64Pref(prefs::kAdsPerHour);
AdsClientHelper::Get()->GetUint64Pref(prefs::kAdsPerDay);

return DoesHistoryRespectCapForRollingTimeConstraint(
history, time_constraint, cap);
Expand Down
2 changes: 1 addition & 1 deletion vendor/bat-native-ads/src/bat/ads/internal/unittest_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ void MockDefaultPrefs(
mock->SetBooleanPref(prefs::kEnabled, true);

mock->SetUint64Pref(prefs::kAdsPerHour, 2);
mock->SetUint64Pref(prefs::kAdsPerDay, 20);
mock->SetUint64Pref(prefs::kAdsPerDay, 40);

mock->SetIntegerPref(prefs::kIdleThreshold, 15);

Expand Down
2 changes: 1 addition & 1 deletion vendor/brave-ios/Ads/BATBraveAds.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
+ (__type)__objc_getter { return ads::__cpp_var; } \
+ (void)__objc_setter:(__type)newValue { ads::__cpp_var = newValue; }

static const NSInteger kDefaultNumberOfAdsPerDay = 20;
static const NSInteger kDefaultNumberOfAdsPerDay = 40;
static const NSInteger kDefaultNumberOfAdsPerHour = 2;

static const int kCurrentUserModelManifestSchemaVersion = 1;
Expand Down