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 connect VPN permissions #398

Merged
merged 2 commits into from
May 16, 2024
Merged

android: fix connect VPN permissions #398

merged 2 commits into from
May 16, 2024

Conversation

kari-ts
Copy link
Collaborator

@kari-ts kari-ts commented May 16, 2024

screen-20240516-134659.mp4

-show VPN connection permissions after intro screen -make toggle state and main view take VPN preparedness into consideration

Fixes tailscale/tailscale#12148

@kari-ts kari-ts requested review from barnstar, oxtoacart and agottardo and removed request for barnstar and oxtoacart May 16, 2024 21:04
@@ -82,20 +105,47 @@ class MainViewModel : IpnViewModel() {
}
}

fun maybeShowVpnPermissionLauncher() {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Perhaps rename to "showVPNPermissionLauncherIfUnauthorized"? Or whatever makes it clearer what it does. :)

-show VPN connection permissions after intro screen
-make toggle state and main view take VPN preparedness into consideration

Fixes tailscale/tailscale#12148

Signed-off-by: kari-ts <kari@tailscale.com>
@kari-ts kari-ts merged commit 12ad295 into main May 16, 2024
3 of 4 checks passed
@kari-ts kari-ts deleted the kari/crash branch May 16, 2024 23:15
kari-ts added a commit that referenced this pull request May 28, 2024
#398 introduced a bug where we were not calling startVPN after getting (or confirming) VPN.prepare permissions
This resulted in the VPN not being turned on after logging in for the first time

Updates tailscale/tailscale#12148

Signed-off-by: kari-ts <kari@tailscale.com>
kari-ts added a commit that referenced this pull request May 28, 2024
#398 introduced a bug where we were not calling startVPN after getting (or confirming) VPN.prepare permissions
This resulted in the VPN not being turned on after logging in for the first time

Updates tailscale/tailscale#12148

Signed-off-by: kari-ts <kari@tailscale.com>
kari-ts added a commit that referenced this pull request May 28, 2024
#398 introduced a bug where we were not calling startVPN after getting (or confirming) VPN.prepare permissions
This resulted in the VPN not being turned on after logging in for the first time

Updates tailscale/tailscale#12148

Signed-off-by: kari-ts <kari@tailscale.com>
kari-ts added a commit that referenced this pull request May 28, 2024
#398 introduced a bug where we were not calling startVPN after getting (or confirming) VPN.prepare permissions
This resulted in the VPN not being turned on after logging in for the first time

Updates tailscale/tailscale#12148

Signed-off-by: kari-ts <kari@tailscale.com>
kari-ts added a commit that referenced this pull request May 28, 2024
#398 introduced a bug where we were not calling startVPN after getting (or confirming) VPN.prepare permissions
This resulted in the VPN not being turned on after logging in for the first time

Updates tailscale/tailscale#12148

Signed-off-by: kari-ts <kari@tailscale.com>
kari-ts added a commit that referenced this pull request May 28, 2024
#398 introduced a bug where we were not calling startVPN after getting (or confirming) VPN.prepare permissions
This resulted in the VPN not being turned on after logging in for the first time

Updates tailscale/tailscale#12148

Signed-off-by: kari-ts <kari@tailscale.com>
kari-ts added a commit that referenced this pull request May 28, 2024
#398 introduced a bug where we were not calling startVPN after getting (or confirming) VPN.prepare permissions
This resulted in the VPN not being turned on after logging in for the first time

Updates tailscale/tailscale#12148

Signed-off-by: kari-ts <kari@tailscale.com>
kari-ts added a commit that referenced this pull request May 29, 2024
-show VPN connection permissions after intro screen
-make toggle state and main view take VPN preparedness into consideration

Fixes tailscale/tailscale#12148

Signed-off-by: kari-ts <kari@tailscale.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants