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

Jump to bottom

Remove brave vpn toolbar button flashes when reconnecting multiple times #20386

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Remove brave vpn toolbar button flashes when reconnecting multiple times #20386

merged 2 commits into from
Oct 10, 2023

Conversation

spylogsster
Copy link
Contributor

@spylogsster spylogsster commented Oct 4, 2023 •
edited
Loading

Resolves brave/brave-browser#33283

  • In order to remove flashing I skipped the connecting/disconnecting states if we are in an error state. The state will be changed when any valid state is restored. The valid state means any except of reconnecting/disconnecting becasuse they do not indicate that the error was fixed.
  • Updated some testing infra to be able to create BraveVpnServiceFactory in tests. Added setter for BraveVPNOSConnectionAPI
  • Little refactoring for BraveVpnServiceFactory to be able to add it to TestingProfile Builder.

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • 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 wiki
    • npm run lint, npm run presubmit wiki, 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:

  • STR from the issue

@spylogsster spylogsster self-assigned this Oct 4, 2023
@github-actions github-actions bot added the potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false label Oct 4, 2023
@spylogsster spylogsster changed the title Button update Remove toolbar button flashes when do multiple reconnects Oct 4, 2023
@spylogsster spylogsster changed the title Remove toolbar button flashes when do multiple reconnects Remove toolbar button flashes when reconnecting multiple times Oct 4, 2023
@spylogsster spylogsster force-pushed the button-update branch 2 times, most recently from 952e45e to d234440 Compare October 4, 2023 15:46
@spylogsster spylogsster changed the title Remove toolbar button flashes when reconnecting multiple times Remove brave vpn toolbar button flashes when reconnecting multiple times Oct 4, 2023
@spylogsster spylogsster marked this pull request as ready for review October 4, 2023 18:10
@spylogsster spylogsster requested a review from a team as a code owner October 4, 2023 18:10
simonhong
simonhong reviewed Oct 5, 2023
View reviewed changes
browser/ui/views/toolbar/brave_vpn_button.cc Outdated
@@ -221,12 +227,14 @@ std::unique_ptr<views::Border> BraveVPNButton::GetBorder(
}

void BraveVPNButton::UpdateColorsAndInsets() {
const bool is_connect_error = IsConnectError();
is_error_state_ = is_connect_error;
Copy link
Member

Choose a reason for hiding this comment

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

I think UpdateColorsAndInsets() is not good place to set is_error_state_.
Could we do it in OnConnectionStateChanged()?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

UpdateColorsAndInsets is also called from OnPurchasedStateChanged

Copy link
Member

Choose a reason for hiding this comment

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

How about having another method only for it and call it from both places?
As UpdateColorsAndInsets() is for updating UI based on current state,
updating error state from it seems not appropriate.

And it should be called when purchased state is changed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@spylogsster spylogsster force-pushed the button-update branch 2 times, most recently from bd6fe05 to 9ab0041 Compare October 5, 2023 12:24
iefremov
iefremov approved these changes Oct 5, 2023
View reviewed changes
Copy link
Contributor

@iefremov iefremov left a comment

Choose a reason for hiding this comment

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

chromium_src lgtm

@simonhong simonhong merged commit e780359 into master Oct 10, 2023
15 checks passed
@simonhong simonhong deleted the button-update branch October 10, 2023 11:43
@github-actions github-actions bot added this to the 1.61.x - Nightly milestone Oct 10, 2023
simonhong added a commit that referenced this pull request Nov 22, 2023
@simonhong
Merge pull request #20386 from brave/button-update
2b48c09 
Remove brave vpn toolbar button flashes when reconnecting multiple times
@simonhong simonhong mentioned this pull request Nov 22, 2023
Merged
7 tasks
kjozwiak pushed a commit that referenced this pull request Nov 23, 2023
@simonhong
Fixed vpn button still has connected state for not purchased user(upl…
91128b5 
…ift to 1.60.x) (#21083)

* Merge pull request #20386 from brave/button-update

Remove brave vpn toolbar button flashes when reconnecting multiple times

* Merge pull request #20533 from brave/vpn_button_state_purchased_state

Fixed vpn button still has connected state for not purchased user
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iefremov iefremov iefremov approved these changes

@simonhong simonhong simonhong approved these changes

@bsclifton bsclifton Awaiting requested review from bsclifton

Assignees

@spylogsster spylogsster

Labels
potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false
Projects
None yet
Milestone
1.61.x - Release
Development

Successfully merging this pull request may close these issues.

Clicking Try again while in the red error state flashes a blip of the VPN panel
3 participants
@spylogsster @iefremov @simonhong