Revert "android: prepare VPN when quick tile is clicked" (#470)

Revert "android: prepare VPN when quick tile is clicked (#451)"

This reverts commit c6f3239b1b.

android/src/main/java/com/tailscale/ipn/App.kt

@@ -9,6 +9,7 @@ import android.app.NotificationChannel
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.net.ConnectivityManager
 import android.net.LinkProperties
@@ -21,9 +22,6 @@ import android.util.Log
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelStore
-import androidx.lifecycle.ViewModelStoreOwner
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
 import com.tailscale.ipn.mdm.MDMSettings
@@ -32,8 +30,6 @@ import com.tailscale.ipn.ui.localapi.Request
 import com.tailscale.ipn.ui.model.Ipn
 import com.tailscale.ipn.ui.notifier.HealthNotifier
 import com.tailscale.ipn.ui.notifier.Notifier
-import com.tailscale.ipn.ui.viewModel.VpnViewModel
-import com.tailscale.ipn.ui.viewModel.VpnViewModelFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -49,7 +45,7 @@ import java.net.NetworkInterface
 import java.security.GeneralSecurityException
 import java.util.Locale
 
-class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner {
+class App : UninitializedApp(), libtailscale.AppContext {
   val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
 
   companion object {
@@ -76,15 +72,6 @@ class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner {
   val dns = DnsConfig()
   private lateinit var connectivityManager: ConnectivityManager
   private lateinit var app: libtailscale.Application
-
-  override val viewModelStore: ViewModelStore
-    get() = appViewModelStore
-
-  lateinit var vpnViewModel: VpnViewModel
-    private set
-
-  private val appViewModelStore: ViewModelStore by lazy { ViewModelStore() }
-
   var healthNotifier: HealthNotifier? = null
 
   override fun getPlatformDNSConfig(): String = dns.dnsConfigAsString
@@ -121,7 +108,6 @@ class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner {
     Notifier.stop()
     notificationManager.cancelAll()
     applicationScope.cancel()
-    viewModelStore.clear()
   }
 
   private var isInitialized = false
@@ -160,11 +146,6 @@ class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner {
         QuickToggleService.setVPNRunning(vpnRunning)
       }
     }
-    initViewModels()
-  }
-
-  private fun initViewModels() {
-    vpnViewModel = ViewModelProvider(this, VpnViewModelFactory(this)).get(VpnViewModel::class.java)
   }
 
   fun setWantRunning(wantRunning: Boolean) {
@@ -537,8 +518,7 @@ open class UninitializedApp : Application() {
   }
 
   fun disallowedPackageNames(): List<String> {
-    val mdmDisallowed =
+    val mdmDisallowed = MDMSettings.excludedPackages.flow.value.value?.split(",")?.map { it.trim() } ?: emptyList()
-        MDMSettings.excludedPackages.flow.value.value?.split(",")?.map { it.trim() } ?: emptyList()
     if (mdmDisallowed.isNotEmpty()) {
       Log.d(TAG, "Excluded application packages were set via MDM: $mdmDisallowed")
       return builtInDisallowedPackageNames + mdmDisallowed

android/src/main/java/com/tailscale/ipn/MainActivity.kt

@@ -18,6 +18,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContract
+import androidx.activity.viewModels
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
@@ -30,7 +31,6 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType
@@ -71,10 +71,8 @@ import com.tailscale.ipn.ui.view.UserSwitcherNav
 import com.tailscale.ipn.ui.view.UserSwitcherView
 import com.tailscale.ipn.ui.viewModel.ExitNodePickerNav
 import com.tailscale.ipn.ui.viewModel.MainViewModel
-import com.tailscale.ipn.ui.viewModel.MainViewModelFactory
 import com.tailscale.ipn.ui.viewModel.PingViewModel
 import com.tailscale.ipn.ui.viewModel.SettingsNav
-import com.tailscale.ipn.ui.viewModel.VpnViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -84,12 +82,7 @@ import kotlinx.coroutines.launch
 class MainActivity : ComponentActivity() {
   private lateinit var navController: NavHostController
   private lateinit var vpnPermissionLauncher: ActivityResultLauncher<Intent>
-  private val viewModel: MainViewModel by lazy {
+  private val viewModel: MainViewModel by viewModels()
-    val app = App.get()
-    vpnViewModel = app.vpnViewModel
-    ViewModelProvider(this, MainViewModelFactory(vpnViewModel)).get(MainViewModel::class.java)
-  }
-  private lateinit var vpnViewModel: VpnViewModel
 
   companion object {
     private const val TAG = "Main Activity"
@@ -112,7 +105,6 @@ class MainActivity : ComponentActivity() {
 
     // grab app to make sure it initializes
     App.get()
-    vpnViewModel = ViewModelProvider(App.get()).get(VpnViewModel::class.java)
 
     // (jonathan) TODO: Force the app to be portrait on small screens until we have
     // proper landscape layout support
@@ -126,11 +118,11 @@ class MainActivity : ComponentActivity() {
         registerForActivityResult(VpnPermissionContract()) { granted ->
           if (granted) {
             Log.d("VpnPermission", "VPN permission granted")
-            vpnViewModel.setVpnPrepared(true)
+            viewModel.setVpnPrepared(true)
             App.get().startVPN()
           } else {
             Log.d("VpnPermission", "VPN permission denied")
-            vpnViewModel.setVpnPrepared(false)
+            viewModel.setVpnPrepared(false)
           }
         }
     viewModel.setVpnPermissionLauncher(vpnPermissionLauncher)

android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt

@@ -70,7 +70,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.tailscale.ipn.App
 import com.tailscale.ipn.R
 import com.tailscale.ipn.mdm.MDMSettings
 import com.tailscale.ipn.mdm.ShowHide
@@ -102,7 +101,6 @@ import com.tailscale.ipn.ui.util.itemsWithDividers
 import com.tailscale.ipn.ui.util.set
 import com.tailscale.ipn.ui.viewModel.IpnViewModel.NodeState
 import com.tailscale.ipn.ui.viewModel.MainViewModel
-import com.tailscale.ipn.ui.viewModel.VpnViewModel
 
 // Navigation actions for the MainView
 data class MainViewNavigation(
@@ -130,7 +128,7 @@ fun MainView(
             // Assume VPN has been prepared for optimistic UI. Whether or not it has been prepared
             // cannot be known
             // until permission has been granted to prepare the VPN.
-            val isPrepared by viewModel.isVpnPrepared.collectAsState(initial = true)
+            val isPrepared by viewModel.vpnPrepared.collectAsState(initial = true)
             val isOn by viewModel.vpnToggleState.collectAsState(initial = false)
             val state by viewModel.ipnState.collectAsState(initial = Ipn.State.NoState)
             val user by viewModel.loggedInUser.collectAsState(initial = null)
@@ -285,7 +283,7 @@ fun ExitNodeStatus(navAction: () -> Unit, viewModel: MainViewModel) {
                         Modifier.padding(start = 16.dp, end = 16.dp, top = 36.dp, bottom = 16.dp)) {
                       Text(
                           text =
-                              managedByOrganization?.let {
+                              managedByOrganization.value?.let {
                                 stringResource(R.string.exit_node_offline_mdm_orgname, it)
                               } ?: stringResource(R.string.exit_node_offline_mdm),
                           style = MaterialTheme.typography.bodyMedium,
@@ -737,9 +735,7 @@ fun PromptPermissionsIfNecessary() {
 @Preview
 @Composable
 fun MainViewPreview() {
-  val vpnViewModel = VpnViewModel(App.get())
+  val vm = MainViewModel()
-  val vm = MainViewModel(vpnViewModel)
-
   MainView(
       {},
       MainViewNavigation(

android/src/main/java/com/tailscale/ipn/ui/view/SettingsView.kt

@@ -37,11 +37,9 @@ import com.tailscale.ipn.ui.util.Lists
 import com.tailscale.ipn.ui.util.set
 import com.tailscale.ipn.ui.viewModel.SettingsNav
 import com.tailscale.ipn.ui.viewModel.SettingsViewModel
-import com.tailscale.ipn.ui.viewModel.VpnViewModel
-import com.tailscale.ipn.ui.notifier.Notifier
 
 @Composable
-fun SettingsView(settingsNav: SettingsNav, viewModel: SettingsViewModel = viewModel(), vpnViewModel: VpnViewModel = viewModel()) {
+fun SettingsView(settingsNav: SettingsNav, viewModel: SettingsViewModel = viewModel()) {
   val handler = LocalUriHandler.current
 
   val user by viewModel.loggedInUser.collectAsState()
@@ -49,7 +47,7 @@ fun SettingsView(settingsNav: SettingsNav, viewModel: SettingsViewModel = viewMo
   val managedByOrganization by viewModel.managedByOrganization.collectAsState()
   val tailnetLockEnabled by viewModel.tailNetLockEnabled.collectAsState()
   val corpDNSEnabled by viewModel.corpDNSEnabled.collectAsState()
-  val isVPNPrepared by vpnViewModel.vpnPrepared.collectAsState()
+  val isVPNPrepared by viewModel.vpnPrepared.collectAsState()
   val showTailnetLock by MDMSettings.manageTailnetLock.flow.collectAsState()
 
   Scaffold(

android/src/main/java/com/tailscale/ipn/ui/viewModel/IpnViewModel.kt

@@ -3,9 +3,11 @@
 
 package com.tailscale.ipn.ui.viewModel
 
+import android.net.VpnService
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.tailscale.ipn.App
 import com.tailscale.ipn.UninitializedApp
 import com.tailscale.ipn.mdm.MDMSettings
 import com.tailscale.ipn.ui.localapi.Client
@@ -62,6 +64,16 @@ open class IpnViewModel : ViewModel() {
   }
 
   init {
+    // Check if the user has granted permission yet.
+    if (!vpnPrepared.value) {
+      val vpnIntent = VpnService.prepare(App.get())
+      if (vpnIntent != null) {
+        setVpnPrepared(false)
+      } else {
+        setVpnPrepared(true)
+      }
+    }
+
     viewModelScope.launch {
       Notifier.state.collect {
         // Reload the user profiles on all state transitions to ensure loggedInUser is correct

android/src/main/java/com/tailscale/ipn/ui/viewModel/MainViewModel.kt

@@ -8,8 +8,6 @@ import android.net.VpnService
 import androidx.activity.result.ActivityResultLauncher
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.text.AnnotatedString
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import com.tailscale.ipn.App
 import com.tailscale.ipn.R
@@ -29,16 +27,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import java.time.Duration
 
-class MainViewModelFactory(private val vpnViewModel: VpnViewModel) : ViewModelProvider.Factory {
+class MainViewModel : IpnViewModel() {
-  override fun <T : ViewModel> create(modelClass: Class<T>): T {
-    if (modelClass.isAssignableFrom(MainViewModel::class.java)) {
-      return MainViewModel(vpnViewModel) as T
-    }
-    throw IllegalArgumentException("Unknown ViewModel class")
-  }
-}
-
-class MainViewModel(private val vpnViewModel: VpnViewModel) : IpnViewModel() {
 
   // The user readable state of the system
   val stateRes: StateFlow<Int> = MutableStateFlow(userStringRes(State.NoState, State.NoState, true))
@@ -67,8 +56,6 @@ class MainViewModel(private val vpnViewModel: VpnViewModel) : IpnViewModel() {
 
   var pingViewModel: PingViewModel = PingViewModel()
 
-  val isVpnPrepared: StateFlow<Boolean> = vpnViewModel.vpnPrepared
-
   // Icon displayed in the button to present the health view
   val healthIcon: StateFlow<Int?> = MutableStateFlow(null)
 
@@ -94,8 +81,7 @@ class MainViewModel(private val vpnViewModel: VpnViewModel) : IpnViewModel() {
     viewModelScope.launch {
       var previousState: State? = null
 
-      combine(Notifier.state, isVpnPrepared) { state, prepared -> state to prepared }
+      combine(Notifier.state, vpnPrepared) { state, prepared -> state to prepared }
-      combine(Notifier.state, isVpnPrepared) { state, prepared -> state to prepared }
           .collect { (currentState, prepared) ->
             stateRes.set(userStringRes(currentState, previousState, prepared))
 
@@ -130,14 +116,14 @@ class MainViewModel(private val vpnViewModel: VpnViewModel) : IpnViewModel() {
           }
         }
       }
+    }
 
-      viewModelScope.launch {
+    viewModelScope.launch {
-        searchTerm.collect { term -> peers.set(peerCategorizer.groupedAndFilteredPeers(term)) }
+      searchTerm.collect { term -> peers.set(peerCategorizer.groupedAndFilteredPeers(term)) }
-      }
+    }
 
-      viewModelScope.launch {
+    viewModelScope.launch {
-        App.get().healthNotifier?.currentIcon?.collect { icon -> healthIcon.set(icon) }
+      App.get().healthNotifier?.currentIcon?.collect { icon -> healthIcon.set(icon) }
-      }
     }
   }
 
@@ -146,15 +132,14 @@ class MainViewModel(private val vpnViewModel: VpnViewModel) : IpnViewModel() {
     if (vpnIntent != null) {
       vpnPermissionLauncher?.launch(vpnIntent)
     } else {
-      vpnViewModel.setVpnPrepared(true)
+      setVpnPrepared(true)
-      vpnViewModel.setVpnPrepared(true)
       startVPN()
     }
   }
 
   fun toggleVpn() {
     val state = Notifier.state.value
-    val isPrepared = vpnViewModel.vpnPrepared.value
+    val isPrepared = vpnPrepared.value
 
     when {
       !isPrepared -> showVPNPermissionLauncherIfUnauthorized()

android/src/main/java/com/tailscale/ipn/ui/viewModel/SettingsViewModel.kt

@@ -47,7 +47,11 @@ class SettingsViewModel : IpnViewModel() {
 
     viewModelScope.launch {
       Notifier.prefs.collect {
-        it?.let { corpDNSEnabled.set(it.CorpDNS) } ?: run { corpDNSEnabled.set(null) }
+        it?.let {
+          corpDNSEnabled.set(it.CorpDNS)
+        } ?: run {
+          corpDNSEnabled.set(null)
+        }
       }
     }
   }

android/src/main/java/com/tailscale/ipn/ui/viewModel/VpnViewModel.kt

@@ -1,48 +0,0 @@
-// Copyright (c) Tailscale Inc & AUTHORS
-// SPDX-License-Identifier: BSD-3-Clause
-
-package com.tailscale.ipn.ui.viewModel
-
-import android.app.Application
-import android.net.VpnService
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-
-class VpnViewModelFactory(private val application: Application) : ViewModelProvider.Factory {
-  @Suppress("UNCHECKED_CAST")
-  override fun <T : ViewModel> create(modelClass: Class<T>): T {
-    if (modelClass.isAssignableFrom(VpnViewModel::class.java)) {
-      return VpnViewModel(application) as T
-    }
-    throw IllegalArgumentException("Unknown ViewModel class")
-  }
-}
-
-class VpnViewModel(application: Application) : AndroidViewModel(application) {
-  // Whether the VPN is prepared
-  val _vpnPrepared = MutableStateFlow(false)
-  val vpnPrepared: StateFlow<Boolean> = _vpnPrepared
-
-  init {
-    prepareVpn()
-  }
-
-  private fun prepareVpn() {
-    // Check if the user has granted permission yet.
-    if (!vpnPrepared.value) {
-      val vpnIntent = VpnService.prepare(getApplication())
-      if (vpnIntent != null) {
-        setVpnPrepared(false)
-      } else {
-        setVpnPrepared(true)
-      }
-    }
-  }
-
-  fun setVpnPrepared(prepared: Boolean) {
-    _vpnPrepared.value = prepared
-  }
-}