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.

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

Hardening is_enabled check for Ads Service #1352

Merged
merged 4 commits into from
Jan 16, 2019
Merged

Hardening is_enabled check for Ads Service #1352

merged 4 commits into from
Jan 16, 2019

Conversation

ryanml
Copy link
Contributor

@ryanml ryanml commented Jan 15, 2019

Fixes: brave/brave-browser#2972
Undoes: #1337

This fix renders what was done in #1337 obsolete

Also migrates current rewards prefs in to their own namespace in brave_rewards/common

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • [] Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@ryanml ryanml added this to the 0.60.x - Dev milestone Jan 15, 2019
@ryanml ryanml self-assigned this Jan 15, 2019
@ryanml ryanml changed the title Makes AdsService factory dependent upon RewardsServiceFactory Makes AdsServiceFactory dependent upon RewardsServiceFactory Jan 15, 2019
@ryanml ryanml changed the title Makes AdsServiceFactory dependent upon RewardsServiceFactory Hardening is_enabled check for Ads Service Jan 15, 2019
@ryanml ryanml force-pushed the fix-2972 branch 2 times, most recently from bf2c660 to efd8259 Compare January 15, 2019 23:56
Adds pref for RewardsMainEnabled and factors that in to Ads Service start
@ryanml ryanml merged commit 6446479 into master Jan 16, 2019
@ryanml ryanml deleted the fix-2972 branch January 16, 2019 00:54
ryanml added a commit that referenced this pull request Jan 16, 2019
Hardening is_enabled check for Ads Service
@NejcZdovc NejcZdovc removed this from the 0.60.x - Dev milestone Jan 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ad notifications sometimes presented to user when Ads toggle is off
3 participants