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

android: fix vpn #232

Merged
merged 1 commit into from
Mar 22, 2024
Merged

android: fix vpn #232

merged 1 commit into from
Mar 22, 2024

Conversation

kari-ts
Copy link
Collaborator

@kari-ts kari-ts commented Mar 22, 2024

-Move most of prepare and establish VPN logic out of Go into Android
-Fix prepareVPN argument to use request codes to differentiate sign in and prepare VPN
-Fix missing adapter implementation (setMtu)

Updates tailscale/corp#18202

-Move most of prepare and establish VPN logic out of Go into Android
-Fix prepareVPN argument to use request codes to differentiate sign in and prepare VPN
-Fix missing adapter implementation (setMtu)

Updates tailscale/corp#18202

Signed-off-by: kari-ts <[email protected]>
@@ -120,32 +120,10 @@ type InputStream interface {
// The below are global callbacks that allow the Java application to notify Go
// of various state changes.

func OnVPNPrepared() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice!

func RequestVPN(service IPNService) {
onVPNRequested <- service
}

func ServiceDisconnect(service IPNService) {
onDisconnect <- service
}

func OnActivityResult(reqCode, resCode int, idToken string) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice!

// TODO: send null Google token
break;
}
// TODO: send Google token
Copy link
Contributor

Choose a reason for hiding this comment

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

Are we keeping Google Signin, or are we switching just to browser-based sign in because of fast user switching?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Browser based, but I do want to investigate what we were using the google token for and make sure that we don't break anything by removing it

@kari-ts kari-ts merged commit b346321 into main Mar 22, 2024
4 checks passed
@kari-ts kari-ts deleted the kari/fixvpn branch May 30, 2024 20:59
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.

3 participants