android: request VPN permissions on launch (#219)

Updates tailscale/corp#18202 The actual requesting of VPN permissions was lost in a rebase. This change should prompt you on start. Signed-off-by: Jonathan Nobels <[email protected]>
tailscale · Mar 19, 2024 · f12439f · f12439f
1 parent 113a7c6
commit f12439f
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/android/src/main/java/com/tailscale/ipn/MainActivity.kt b/android/src/main/java/com/tailscale/ipn/MainActivity.kt
@@ -13,6 +13,7 @@ import android.os.Bundle
 import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavType
@@ -45,6 +46,7 @@ import kotlinx.coroutines.launch
 
 class MainActivity : ComponentActivity() {
   private var notifierScope: CoroutineScope? = null
+  private lateinit var requestVpnPermission: ActivityResultLauncher<Unit>
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -150,14 +152,15 @@ class MainActivity : ComponentActivity() {
     val vpnIntent = VpnService.prepare(this)
     if (vpnIntent != null) {
       val contract = VpnPermissionContract()
-      registerForActivityResult(contract) { granted ->
-        Notifier.vpnPermissionGranted.set(granted)
-        if (granted) {
-          Log.i("VPN", "VPN permission granted")
-        } else {
-          Log.i("VPN", "VPN permission not granted")
-        }
-      }
+      requestVpnPermission =
+          registerForActivityResult(contract) { granted ->
+            Notifier.vpnPermissionGranted.set(granted)
+            Log.i("VPN", "VPN permission ${if (granted) "granted" else "denied"}")
+          }
+      requestVpnPermission.launch(Unit)
+    } else {
+      Notifier.vpnPermissionGranted.set(true)
+      Log.i("VPN", "VPN permission granted")
     }
   }
 }