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

Add shields settings #9240

Merged
merged 2 commits into from
Jun 29, 2021
Merged

Add shields settings #9240

merged 2 commits into from
Jun 29, 2021

Conversation

alexsafe
Copy link
Contributor

@alexsafe alexsafe commented Jun 24, 2021

Resolves brave/brave-browser#16300
Resolves brave/brave-browser#16299

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

  1. Check ad blocker, fingerprinting, cookies settings as the code has been refactored
  2. Check there is no conflict between shields settings and the global settings
  3. Check that shields settings are working on the loaded site after swiping out and re-starting the app
  4. Check for update too, as we had that issue before

@alexsafe alexsafe added CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS labels Jun 24, 2021
@alexsafe alexsafe added this to the 1.28.x - Nightly milestone Jun 24, 2021
@alexsafe alexsafe self-assigned this Jun 24, 2021
Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

@alexsafe alexsafe merged commit fdd7cbc into master Jun 29, 2021
@alexsafe alexsafe deleted the add-shields-settings branch June 29, 2021 21:34
brave-builds pushed a commit that referenced this pull request Jun 30, 2021
@srirambv
Copy link
Contributor

srirambv commented Jul 5, 2021

Verification passed on OnePlus 6T with Android 10 running 1.28.51 x64 nightly build

  • Verified Ads/Trackers setting is changed to allow selection between strict/standard/allow all similar to desktop
  • Verified setting global setting for ad blocker to strict sets is on site shields settings as well
  • Verified shields settings is visible on both normal and private tabs
  • Verified shields settings shows new option after upgrade
  • Verified setting ad blocker to strict and upgrading retains the setting and sets ad blocking to strict even on site shields settings

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
3 participants