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

Vpn always on & kill switch android #23293

Merged
merged 4 commits into from
May 1, 2024
Merged

Conversation

deeppandya
Copy link
Contributor

@deeppandya deeppandya commented Apr 25, 2024

Resolves brave/brave-browser#37013
Resolves brave/brave-browser#23193

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 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:

@deeppandya deeppandya added CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64 labels Apr 25, 2024
@deeppandya deeppandya added this to the 1.67.x - Nightly milestone Apr 25, 2024
@deeppandya deeppandya self-assigned this Apr 25, 2024
@deeppandya deeppandya requested a review from a team as a code owner April 25, 2024 21:51
2. Find Brave VPN and tap on the settings icon to the right.
</message>
<message name="IDS_KILL_SWITCH_TUTORIAL_TEXT_3" desc="Vpn kill swicth tutorial text">
3. Toggle <ph name="ALWAYS_ON_TUTORIAL_START">&lt;always_on_tutorial&gt;</ph>Always-on VPN<ph name="ALWAYS_ON_TUTORIAL_END">&lt;/always_on_tutorial&gt;</ph> to enable it.\n4. Toggle <ph name="ALWAYS_ON_TUTORIAL_2_START">&lt;always_on_tutorial_2&gt;</ph>Block connections without VPN<ph name="ALWAYS_ON_TUTORIAL_2_END">&lt;/always_on_tutorial_2&gt;</ph> to enable the kill switch.
Copy link
Member

Choose a reason for hiding this comment

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

I would do 1, 2, 3, 4 rather or together or 3 and 4 as separate strings as 1, 2.

android:text="@string/kill_switch_text"
android:gravity="center_horizontal"/>
</LinearLayout>
</ScrollView>
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: empty line

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.

++

Copy link
Contributor

[puLL-Merge] - brave/brave-core@23293

Description

This PR adds a new "Always-on VPN & Kill switch" feature to the Brave VPN settings on Android. It includes a tutorial screen explaining how to enable always-on VPN and the kill switch in the Android system settings.

Changes

Changes

  • android/brave_java_resources.gni: Adds new drawables for the always-on VPN tutorial
  • android/brave_java_sources.gni: Adds new Java classes for the always-on VPN feature
  • android/java/AndroidManifest.xml: Declares the new VpnAlwaysOnActivity
  • android/java/org/chromium/chrome/browser/vpn/activities/: Adds VpnAlwaysOnActivity to handle the always-on tutorial
  • android/java/org/chromium/chrome/browser/vpn/adapters/: Adds AlwaysOnPagerAdapter for the tutorial view pager
  • android/java/res/: Adds new drawables, layouts, colors, dimensions and styles for the always-on tutorial UI
  • android/java/res/xml/brave_vpn_preferences.xml: Adds the "Always-on VPN" preference to Brave VPN settings
  • browser/ui/android/strings/android_brave_strings.grd: Adds new strings for the always-on tutorial

Security Hotspots

None identified. The changes are limited to the Brave VPN UI and do not seem to introduce any new security risks. The always-on VPN and kill switch capabilities leverage the existing Android system settings securely.

Copy link
Collaborator

@mkarolin mkarolin left a comment

Choose a reason for hiding this comment

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

strings++

@deeppandya deeppandya merged commit eae9f70 into master May 1, 2024
19 checks passed
@deeppandya deeppandya deleted the vpn_always_on_android branch May 1, 2024 15:55
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 CI/skip-windows-x64 Do not run CI builds for Windows x64 puLL-Merge unused-CI/skip-linux-x64 Do not run CI builds for Linux x64
Projects
None yet
4 participants