android: start VPN after preparing VPN

#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>
tailscale · May 28, 2024 · 39c0cb3 · 39c0cb3
1 parent 75db9e6
commit 39c0cb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/android/src/main/java/com/tailscale/ipn/MainActivity.kt b/android/src/main/java/com/tailscale/ipn/MainActivity.kt
@@ -117,12 +117,13 @@ class MainActivity : ComponentActivity() {
           if (granted) {
             Log.d("VpnPermission", "VPN permission granted")
             viewModel.setVpnPrepared(true)
+            App.get().startVPN()
           } else {
             Log.d("VpnPermission", "VPN permission denied")
             viewModel.setVpnPrepared(false)
           }
         }
-        viewModel.setVpnPermissionLauncher(vpnPermissionLauncher)
+    viewModel.setVpnPermissionLauncher(vpnPermissionLauncher)
 
     setContent {
       AppTheme {

diff --git a/android/src/main/java/com/tailscale/ipn/ui/viewModel/MainViewModel.kt b/android/src/main/java/com/tailscale/ipn/ui/viewModel/MainViewModel.kt
@@ -109,6 +109,7 @@ class MainViewModel : IpnViewModel() {
       vpnPermissionLauncher?.launch(vpnIntent)
     } else {
       setVpnPrepared(true)
+      startVPN()
     }
   }
 
@@ -119,7 +120,6 @@ class MainViewModel : IpnViewModel() {
     when {
       !isPrepared -> showVPNPermissionLauncherIfUnauthorized()
       state == Ipn.State.Running -> stopVPN()
-      else -> startVPN()
     }
   }