android: move taildrop directory selector out of onboarding

-ShareFileHelper manages directory readiness; when a file is being shared to the device, it emits a signal to prompt the user to pick a directory
-Remove MDM auth key check; there is no longer any need to make assumptions about Taildrop usage, and we only show the directory selector when they are receiving a Taildropped file
-Listen for Taildrop receipt in application view model (formerly VpnViewModel, now renamed due to its expanded scope), since Taildrop can occur even without MainActivity
TODO: in OSS, SAF mode should be determined by OS, and not by the dir, since the dir may not be set immediately.

Updates tailscale/corp#29211

Signed-off-by: kari-ts <[email protected]>

Author: kari-ts

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

@@ -33,8 +33,8 @@ import com.tailscale.ipn.ui.model.Ipn
 import com.tailscale.ipn.ui.model.Netmap
 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 com.tailscale.ipn.ui.viewModel.AppViewModel
+import com.tailscale.ipn.ui.viewModel.AppViewModelFactory
 import com.tailscale.ipn.util.FeatureFlags
 import com.tailscale.ipn.util.ShareFileHelper
 import com.tailscale.ipn.util.TSLog
@@ -211,23 +211,26 @@ class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner {
    * Tailscale because directFileRoot must be set before LocalBackend starts being used.
    */
   fun startLibtailscale(directFileRoot: String) {
-    ShareFileHelper.init(this, directFileRoot)
+    ShareFileHelper.init(this, directFileRoot, applicationScope)
     app = Libtailscale.start(this.filesDir.absolutePath, directFileRoot, this)
     Request.setApp(app)
     Notifier.setApp(app)
     Notifier.start(applicationScope)
+    TSLog.d(TAG, "Starting libtailscale with directFileRoot: $directFileRoot")
   }
 
   private fun initViewModels() {
-    vpnViewModel = ViewModelProvider(this, VpnViewModelFactory(this)).get(VpnViewModel::class.java)
+    appViewModel =
+        ViewModelProvider(this, AppViewModelFactory(this, ShareFileHelper.observeTaildropPrompt()))
+            .get(AppViewModel::class.java)
   }
 
   fun setWantRunning(wantRunning: Boolean, onSuccess: (() -> Unit)? = null) {
     val callback: (Result<Ipn.Prefs>) -> Unit = { result ->
       result.fold(
           onSuccess = { onSuccess?.invoke() },
           onFailure = { error ->
-            TSLog.d("TAG", "Set want running: failed to update preferences: ${error.message}")
+            TSLog.d(TAG, "Set want running: failed to update preferences: ${error.message}")
           })
     }
     Client(applicationScope)
@@ -390,7 +393,7 @@ open class UninitializedApp : Application() {
     private lateinit var appInstance: UninitializedApp
     lateinit var notificationManager: NotificationManagerCompat
 
-    lateinit var vpnViewModel: VpnViewModel
+    lateinit var appViewModel: AppViewModel
 
     @JvmStatic
     fun get(): UninitializedApp {
@@ -577,8 +580,8 @@ open class UninitializedApp : Application() {
     return builtInDisallowedPackageNames + userDisallowed
   }
 
-  fun getAppScopedViewModel(): VpnViewModel {
-    return vpnViewModel
+  fun getAppScopedViewModel(): AppViewModel {
+    return appViewModel
   }
 
   val builtInDisallowedPackageNames: List<String> =

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

@@ -84,13 +84,14 @@ import com.tailscale.ipn.ui.view.TaildropDirView
 import com.tailscale.ipn.ui.view.TailnetLockSetupView
 import com.tailscale.ipn.ui.view.UserSwitcherNav
 import com.tailscale.ipn.ui.view.UserSwitcherView
+import com.tailscale.ipn.ui.viewModel.AppViewModel
 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.PermissionsViewModel
 import com.tailscale.ipn.ui.viewModel.PingViewModel
 import com.tailscale.ipn.ui.viewModel.SettingsNav
-import com.tailscale.ipn.ui.viewModel.VpnViewModel
+import com.tailscale.ipn.util.ShareFileHelper
 import com.tailscale.ipn.util.TSLog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
@@ -104,10 +105,10 @@ class MainActivity : ComponentActivity() {
   private lateinit var vpnPermissionLauncher: ActivityResultLauncher<Intent>
   private val viewModel: MainViewModel by lazy {
     val app = App.get()
-    vpnViewModel = app.getAppScopedViewModel()
-    ViewModelProvider(this, MainViewModelFactory(vpnViewModel)).get(MainViewModel::class.java)
+    appViewModel = app.getAppScopedViewModel()
+    ViewModelProvider(this, MainViewModelFactory(appViewModel)).get(MainViewModel::class.java)
   }
-  private lateinit var vpnViewModel: VpnViewModel
+  private lateinit var appViewModel: AppViewModel
   val permissionsViewModel: PermissionsViewModel by viewModels()
 
   companion object {
@@ -132,7 +133,7 @@ class MainActivity : ComponentActivity() {
 
     // grab app to make sure it initializes
     App.get()
-    vpnViewModel = ViewModelProvider(App.get()).get(VpnViewModel::class.java)
+    appViewModel = ViewModelProvider(App.get()).get(AppViewModel::class.java)
 
     val rm = getSystemService(Context.RESTRICTIONS_SERVICE) as RestrictionsManager
     MDMSettings.update(App.get(), rm)
@@ -154,15 +155,15 @@ class MainActivity : ComponentActivity() {
         registerForActivityResult(VpnPermissionContract()) { granted ->
           if (granted) {
             TSLog.d("VpnPermission", "VPN permission granted")
-            vpnViewModel.setVpnPrepared(true)
+            appViewModel.setVpnPrepared(true)
             App.get().startVPN()
           } else {
             if (isAnotherVpnActive(this)) {
               TSLog.d("VpnPermission", "Another VPN is likely active")
               showOtherVPNConflictDialog()
             } else {
               TSLog.d("VpnPermission", "Permission was denied by the user")
-              vpnViewModel.setVpnPrepared(false)
+              appViewModel.setVpnPrepared(false)
 
               AlertDialog.Builder(this)
                   .setTitle(R.string.vpn_permission_needed)
@@ -201,6 +202,7 @@ class MainActivity : ComponentActivity() {
                   Libtailscale.setDirectFileRoot(uri.toString())
                   TaildropDirectoryStore.saveFileDirectory(uri)
                   permissionsViewModel.refreshCurrentDir()
+                  ShareFileHelper.notifyDirectoryReady()
                 } catch (e: Exception) {
                   TSLog.e("MainActivity", "Failed to set Taildrop root: $e")
                 }
@@ -219,7 +221,7 @@ class MainActivity : ComponentActivity() {
           }
         }
 
-    viewModel.setDirectoryPickerLauncher(directoryPickerLauncher)
+    appViewModel.setDirectoryPickerLauncher(directoryPickerLauncher)
 
     setContent {
       navController = rememberNavController()
@@ -308,7 +310,11 @@ class MainActivity : ComponentActivity() {
                           onNavigateToAuthKey = { navController.navigate("loginWithAuthKey") })
 
                   composable("main", enterTransition = { fadeIn(animationSpec = tween(150)) }) {
-                    MainView(loginAtUrl = ::login, navigation = mainViewNav, viewModel = viewModel)
+                    MainView(
+                        loginAtUrl = ::login,
+                        navigation = mainViewNav,
+                        viewModel = viewModel,
+                        appViewModel = appViewModel)
                   }
                   composable("search") {
                     val autoFocus = viewModel.autoFocusSearch

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

@@ -109,10 +109,11 @@ import com.tailscale.ipn.ui.util.LoadingIndicator
 import com.tailscale.ipn.ui.util.PeerSet
 import com.tailscale.ipn.ui.util.itemsWithDividers
 import com.tailscale.ipn.ui.util.set
+import com.tailscale.ipn.ui.viewModel.AppViewModel
 import com.tailscale.ipn.ui.viewModel.IpnViewModel.NodeState
 import com.tailscale.ipn.ui.viewModel.MainViewModel
-import com.tailscale.ipn.ui.viewModel.VpnViewModel
 import com.tailscale.ipn.util.FeatureFlags
+import com.tailscale.ipn.util.ShareFileHelper
 
 // Navigation actions for the MainView
 data class MainViewNavigation(
@@ -129,12 +130,13 @@ fun MainView(
     loginAtUrl: (String) -> Unit,
     navigation: MainViewNavigation,
     viewModel: MainViewModel,
+    appViewModel: AppViewModel
 ) {
   val currentPingDevice by viewModel.pingViewModel.peer.collectAsState()
   val healthIcon by viewModel.healthIcon.collectAsState()
 
   LoadingIndicator.Wrap {
-    Scaffold(contentWindowInsets = WindowInsets.Companion.statusBars) { paddingInsets ->
+    Scaffold(contentWindowInsets = WindowInsets.statusBars) { paddingInsets ->
       Column(
           modifier = Modifier.fillMaxWidth().padding(paddingInsets),
           verticalArrangement = Arrangement.Center) {
@@ -152,7 +154,7 @@ fun MainView(
             val disableToggle by MDMSettings.forceEnabled.flow.collectAsState()
             val showKeyExpiry by viewModel.showExpiry.collectAsState(initial = false)
             val showDirectoryPickerInterstitial by
-                viewModel.showDirectoryPickerInterstitial.collectAsState()
+                appViewModel.showDirectoryPickerInterstitial.collectAsState()
 
             // Hide the header only on Android TV when the user needs to login
             val hideHeader = (isAndroidTV() && state == Ipn.State.NeedsLogin)
@@ -217,15 +219,7 @@ fun MainView(
               Ipn.State.Running -> {
                 viewModel.maybeRequestVpnPermission()
                 LaunchVpnPermissionIfNeeded(viewModel)
-                PromptForMissingPermissions(viewModel)
-
-                if (!viewModel.skipPromptsForAuthKeyLogin()) {
-                  LaunchedEffect(state) {
-                    if (state == Ipn.State.Running && !isAndroidTV()) {
-                      viewModel.checkIfTaildropDirectorySelected()
-                    }
-                  }
-                }
+                PromptForMissingPermissions(appViewModel)
 
                 if (showKeyExpiry) {
                   ExpiryNotification(netmap = netmap, action = { viewModel.login() })
@@ -260,20 +254,23 @@ fun MainView(
               }
             }
 
-            showDirectoryPickerInterstitial.let { show ->
-              if (show) {
+            appViewModel.showDirectoryPickerInterstitial.let { show ->
+              if (show.value) {
                 AppTheme {
                   AlertDialog(
-                      onDismissRequest = { viewModel.showDirectoryPickerLauncher() },
+                      onDismissRequest = { appViewModel.showDirectoryPickerLauncher() },
                       title = {
                         Text(text = stringResource(id = R.string.taildrop_directory_picker_title))
                       },
                       text = { TaildropDirectoryPickerPrompt() },
                       confirmButton = {
-                        PrimaryActionButton(onClick = { viewModel.showDirectoryPickerLauncher() }) {
-                          Text(
-                              text = stringResource(id = R.string.taildrop_directory_picker_button))
-                        }
+                        PrimaryActionButton(
+                            onClick = { appViewModel.showDirectoryPickerLauncher() }) {
+                              Text(
+                                  text =
+                                      stringResource(
+                                          id = R.string.taildrop_directory_picker_button))
+                            }
                       })
                 }
               }
@@ -797,8 +794,8 @@ fun ExpiryNotification(netmap: Netmap.NetworkMap?, action: () -> Unit = {}) {
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
-fun PromptForMissingPermissions(viewModel: MainViewModel) {
-  if (viewModel.skipPromptsForAuthKeyLogin()) {
+fun PromptForMissingPermissions(appViewModel: AppViewModel) {
+  if (appViewModel.skipPromptsForAuthKeyLogin()) {
     return
   }
 
@@ -869,8 +866,8 @@ fun Search(
 @Preview
 @Composable
 fun MainViewPreview() {
-  val vpnViewModel = VpnViewModel(App.get())
-  val vm = MainViewModel(vpnViewModel)
+  val appViewModel = AppViewModel(App.get(), ShareFileHelper.taildropPrompt)
+  val vm = MainViewModel(appViewModel)
 
   MainView(
       {},
@@ -880,5 +877,6 @@ fun MainViewPreview() {
           onNavigateToExitNodes = {},
           onNavigateToHealth = {},
           onNavigateToSearch = {}),
-      vm)
+      vm,
+      appViewModel)
 }

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

@@ -40,13 +40,13 @@ 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.viewModel.AppViewModel
 
 @Composable
 fun SettingsView(
     settingsNav: SettingsNav,
     viewModel: SettingsViewModel = viewModel(),
-    vpnViewModel: VpnViewModel = viewModel()
+    appViewModel: AppViewModel = viewModel()
 ) {
   val handler = LocalUriHandler.current
 
@@ -55,7 +55,7 @@ fun SettingsView(
   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 appViewModel.vpnPrepared.collectAsState()
   val showTailnetLock by MDMSettings.manageTailnetLock.flow.collectAsState()
   val useTailscaleSubnets by MDMSettings.useTailscaleSubnets.flow.collectAsState()