-
Notifications
You must be signed in to change notification settings - Fork 465
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
android: implement app split tunneling support
Updates tailscale/tailscale#6912
- Loading branch information
Showing
10 changed files
with
236 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
android/src/main/java/com/tailscale/ipn/ui/util/InstalledAppsManager.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package com.tailscale.ipn.ui.util | ||
|
|
||
| import android.Manifest | ||
| import android.content.pm.ApplicationInfo | ||
| import android.content.pm.PackageManager | ||
|
|
||
| data class InstalledApp(val name: String, val packageName: String) | ||
|
|
||
| class InstalledAppsManager( | ||
| val packageManager: PackageManager, | ||
| ) { | ||
| fun fetchInstalledApps(): List<InstalledApp> { | ||
| return packageManager | ||
| .getInstalledApplications(PackageManager.GET_META_DATA) | ||
| .filter(appIsIncluded) | ||
| .map { | ||
| InstalledApp( | ||
| name = it.loadLabel(packageManager).toString(), | ||
| packageName = it.packageName, | ||
| ) | ||
| } | ||
| .sortedBy { it.name } | ||
| } | ||
|
|
||
| private val appIsIncluded: (ApplicationInfo) -> Boolean = { app -> | ||
| app.packageName != "com.tailscale.ipn" && | ||
| // Only show apps that can access the Internet | ||
| packageManager.checkPermission(Manifest.permission.INTERNET, app.packageName) == | ||
| PackageManager.PERMISSION_GRANTED | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
android/src/main/java/com/tailscale/ipn/ui/view/SplitTunnelAppPickerView.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| package com.tailscale.ipn.ui.view | ||
|
|
||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.lazy.LazyColumn | ||
| import androidx.compose.foundation.lazy.items | ||
| import androidx.compose.material3.Checkbox | ||
| import androidx.compose.material3.ListItem | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.collectAsState | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.asImageBitmap | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.core.graphics.drawable.toBitmap | ||
| import androidx.lifecycle.viewmodel.compose.viewModel | ||
| import com.tailscale.ipn.R | ||
| import com.tailscale.ipn.ui.util.Lists | ||
| import com.tailscale.ipn.ui.viewModel.SplitTunnelAppPickerViewModel | ||
|
|
||
| @Composable | ||
| fun SplitTunnelAppPickerView( | ||
| backToSettings: BackNavigation, | ||
| model: SplitTunnelAppPickerViewModel = viewModel() | ||
| ) { | ||
| val installedApps by model.installedApps.collectAsState() | ||
| val excludedPackageNames by model.excludedPackageNames.collectAsState() | ||
|
|
||
| Scaffold(topBar = { Header(titleRes = R.string.split_tunneling, onBack = backToSettings) }) { | ||
| innerPadding -> | ||
| LazyColumn(modifier = Modifier.padding(innerPadding)) { | ||
| item(key = "header") { | ||
| ListItem( | ||
| headlineContent = { | ||
| Text( | ||
| stringResource( | ||
| R.string | ||
| .selected_apps_will_access_the_internet_directly_without_using_tailscale)) | ||
| }) | ||
| } | ||
| item("resolversHeader") { Lists.SectionDivider("Available apps") } | ||
| items(installedApps) { app -> | ||
| ListItem( | ||
| headlineContent = { Text(app.name, fontWeight = FontWeight.SemiBold) }, | ||
| leadingContent = { | ||
| Image( | ||
| bitmap = | ||
| model.installedAppsManager.packageManager | ||
| .getApplicationIcon(app.packageName) | ||
| .toBitmap() | ||
| .asImageBitmap(), | ||
| contentDescription = null, | ||
| modifier = Modifier.width(40.dp).height(40.dp)) | ||
| }, | ||
| supportingContent = { | ||
| Text( | ||
| app.packageName, | ||
| color = MaterialTheme.colorScheme.secondary, | ||
| fontSize = MaterialTheme.typography.bodySmall.fontSize, | ||
| letterSpacing = MaterialTheme.typography.bodySmall.letterSpacing) | ||
| }, | ||
| trailingContent = { | ||
| Checkbox( | ||
| checked = excludedPackageNames.contains(app.packageName), | ||
| onCheckedChange = { checked -> | ||
| if (checked) { | ||
| model.exclude(packageName = app.packageName) | ||
| } else { | ||
| model.unexclude(packageName = app.packageName) | ||
| } | ||
| }) | ||
| }) | ||
| Lists.ItemDivider() | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
android/src/main/java/com/tailscale/ipn/ui/viewModel/SplitTunnelAppPickerViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package com.tailscale.ipn.ui.viewModel | ||
|
|
||
| import androidx.lifecycle.ViewModel | ||
| import com.tailscale.ipn.App | ||
| import com.tailscale.ipn.ui.util.InstalledApp | ||
| import com.tailscale.ipn.ui.util.InstalledAppsManager | ||
| import com.tailscale.ipn.ui.util.set | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
|
|
||
| class SplitTunnelAppPickerViewModel : ViewModel() { | ||
| val installedAppsManager = InstalledAppsManager(packageManager = App.get().packageManager) | ||
| val excludedPackageNames: StateFlow<List<String>> = MutableStateFlow(listOf()) | ||
| val installedApps: StateFlow<List<InstalledApp>> = MutableStateFlow(listOf()) | ||
|
|
||
| init { | ||
| excludedPackageNames.set(App.get().disallowedPackageNames()) | ||
| installedApps.set(installedAppsManager.fetchInstalledApps()) | ||
| } | ||
|
|
||
| fun exclude(packageName: String) { | ||
| if (excludedPackageNames.value.contains(packageName)) { | ||
| return | ||
| } | ||
| excludedPackageNames.set(excludedPackageNames.value + packageName) | ||
| App.get().addDisallowedPackageName(packageName) | ||
| } | ||
|
|
||
| fun unexclude(packageName: String) { | ||
| excludedPackageNames.set(excludedPackageNames.value - packageName) | ||
| App.get().removeDisallowedPackageName(packageName) | ||
| } | ||
| } |
Oops, something went wrong.