Skip to content

[ads] Preserve search ad info bar preference when clearing ads data #29028

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

Merged
merged 1 commit into from
May 13, 2025
Merged

[ads] Preserve search ad info bar preference when clearing ads data #29028

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
48 changes: 36 additions & 12 deletions components/brave_ads/core/internal/prefs/obsolete_pref_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,67 @@

#include "brave/components/brave_ads/core/public/prefs/obsolete_pref_util.h"

#include "brave/components/brave_ads/core/public/prefs/pref_names.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"

namespace brave_ads {

namespace {

constexpr char kHasMigratedConversionState[] =
constexpr char kObsoleteHasMigratedConversionState[] =
"brave.brave_ads.migrated.conversion_state";
constexpr char kHasMigratedNotificationState[] =
constexpr char kObsoleteHasMigratedNotificationState[] =
"brave.brave_ads.has_migrated.notification_state";
constexpr char kHasMigratedRewardsState[] =
constexpr char kObsoleteHasMigratedRewardsState[] =
"brave.brave_ads.migrated.rewards_state";

constexpr char kShouldMigrateVerifiedRewardsUser[] =
constexpr char kObsoleteShouldMigrateVerifiedRewardsUser[] =
"brave.brave_ads.rewards.verified_user.should_migrate";

constexpr char kObsoleteShouldShowSearchResultAdClickedInfoBar[] =
"brave.brave_ads.should_show_search_result_ad_clicked_infobar";

void MaybeMigrateShouldShowSearchResultAdClickedInfoBarProfilePref(
PrefService* const prefs) {
if (!prefs->HasPrefPath(kObsoleteShouldShowSearchResultAdClickedInfoBar)) {
return;
}

prefs->SetBoolean(
prefs::kShouldShowSearchResultAdClickedInfoBar,
prefs->GetBoolean(kObsoleteShouldShowSearchResultAdClickedInfoBar));
prefs->ClearPref(kObsoleteShouldShowSearchResultAdClickedInfoBar);
}

} // namespace

void RegisterProfilePrefsForMigration(PrefRegistrySimple* const registry) {
// Added 08/2024.
registry->RegisterBooleanPref(kHasMigratedConversionState, false);
registry->RegisterBooleanPref(kHasMigratedNotificationState, false);
registry->RegisterBooleanPref(kHasMigratedRewardsState, false);
registry->RegisterBooleanPref(kObsoleteHasMigratedConversionState, false);
registry->RegisterBooleanPref(kObsoleteHasMigratedNotificationState, false);
registry->RegisterBooleanPref(kObsoleteHasMigratedRewardsState, false);

// Added 10/2024.
registry->RegisterBooleanPref(kShouldMigrateVerifiedRewardsUser, false);
registry->RegisterBooleanPref(kObsoleteShouldMigrateVerifiedRewardsUser,
false);

// Added 05/2025.
registry->RegisterBooleanPref(kObsoleteShouldShowSearchResultAdClickedInfoBar,
false);
}

void MigrateObsoleteProfilePrefs(PrefService* const prefs) {
// Added 08/2024.
prefs->ClearPref(kHasMigratedConversionState);
prefs->ClearPref(kHasMigratedNotificationState);
prefs->ClearPref(kHasMigratedRewardsState);
prefs->ClearPref(kObsoleteHasMigratedConversionState);
prefs->ClearPref(kObsoleteHasMigratedNotificationState);
prefs->ClearPref(kObsoleteHasMigratedRewardsState);

// Added 10/2024.
prefs->ClearPref(kShouldMigrateVerifiedRewardsUser);
prefs->ClearPref(kObsoleteShouldMigrateVerifiedRewardsUser);

// Added 05/2025.
MaybeMigrateShouldShowSearchResultAdClickedInfoBarProfilePref(prefs);
}

} // namespace brave_ads
11 changes: 8 additions & 3 deletions components/brave_ads/core/public/prefs/pref_names.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

namespace brave_ads::prefs {

// IMPORTANT: Prefs that need clearing should be prefixed with
// `brave.brave_ads`.

// Ads prefs.
inline constexpr char kDiagnosticId[] = "brave.brave_ads.diagnostics.id";

Expand Down Expand Up @@ -68,9 +71,6 @@ inline constexpr char kNotificationAdDidFallbackToCustom[] =
inline constexpr char kShouldShowOnboardingNotification[] =
"brave.brave_ads.should_show_my_first_ad_notification";

inline constexpr char kShouldShowSearchResultAdClickedInfoBar[] =
"brave.brave_ads.should_show_search_result_ad_clicked_infobar";

// Brave stats prefs.
inline constexpr char kEnabledForLastProfile[] =
"brave.brave_ads.enabled_last_profile";
Expand All @@ -80,6 +80,11 @@ inline constexpr char kEverEnabledForAnyProfile[] =
// P2A prefs.
inline constexpr char kP2APrefPathPrefix[] = "brave.weekly_storage.";

// We don't prefix `brave.brave_ads` to this pref path because we don't want
// them cleared if the user clears ads data or resets Brave Rewards.
inline constexpr char kShouldShowSearchResultAdClickedInfoBar[] =
"brave.search.search_result_ad.should_show_clicked_infobar";

} // namespace brave_ads::prefs

#endif // BRAVE_COMPONENTS_BRAVE_ADS_CORE_PUBLIC_PREFS_PREF_NAMES_H_
Loading