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

Show connection error view if network unavailable #13593

Merged
merged 3 commits into from
Jun 6, 2022
Merged

Conversation

spylogsster
Copy link
Contributor

@spylogsster spylogsster commented Jun 3, 2022

Resolves brave/brave-browser#22754

Brave.Browser.Development.-.New.Tab.-.3.June.2022.mp4

Checking network adapters status before setting internal connection status and correct it if no network access.

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
  • 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, 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. Complete the steps under Brave Premium login > Login to an existing account which has VPN
  2. Unplug your network cable (or disable Wi-Fi)
  3. Click the VPN button (top right, next to hamburger button)
  4. Click the toggle to ENABLE
  5. You should see the error about not being able to connect
  6. Plug network cable back in OR enable Wi-Fi (disabled in step 2)
  7. Click the Try again button
  8. It should work now

Copy link
Member

@simonhong simonhong left a comment

Choose a reason for hiding this comment

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

How about early return when network is unavailalbe in the Connect() instead of going normal path?

@@ -12,6 +12,7 @@
#include "base/json/json_writer.h"
#include "base/strings/utf_string_conversions.h"
#include "brave/components/skus/browser/skus_utils.h"
#include "net/base/network_change_notifier.h"
Copy link
Member

@simonhong simonhong Jun 5, 2022

Choose a reason for hiding this comment

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

How about moving this include to below #if !BUILDFLAG(IS_ANDROID) as it's used in non-android code?
and this include doesn't need to add //net to deps list?
Hmm, already we've included net's headers below. Curious why gn_check doesn't complain about it.
Maybe it's allowed by public_deps of other deps? :)
I think just adding //net to deps explicitely is sufficient.

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
Copy link
Contributor Author

How about early return when network is unavailalbe in the Connect() instead of going normal path?

done

Copy link
Member

@simonhong simonhong left a comment

Choose a reason for hiding this comment

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

++

@spylogsster
Copy link
Contributor Author

Failed tests are not replated to this PR

@spylogsster spylogsster merged commit 498737f into master Jun 6, 2022
@spylogsster spylogsster deleted the brave-22754 branch June 6, 2022 11:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Should show connection-error message after disabling network
2 participants