Skip to content

Commit bbe3270

Browse files
authored
android: hide allow LAN access if feature not enabled (#583)
excludeRoute is only supported on API 33+, so we are not supporting allow LAN access for older versions. To avoid confusion, don't show the option if the feature is not enabled. Updates tailscale/corp#25083 Signed-off-by: kari-ts <[email protected]>
1 parent 205aeae commit bbe3270

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,14 @@ import com.tailscale.ipn.ui.viewModel.ExitNodePickerViewModel
3636
import com.tailscale.ipn.ui.viewModel.ExitNodePickerViewModelFactory
3737
import com.tailscale.ipn.ui.viewModel.selected
3838
import kotlinx.coroutines.flow.MutableStateFlow
39+
import android.os.Build
3940

4041
@Composable
4142
fun ExitNodePicker(
4243
nav: ExitNodePickerNav,
4344
model: ExitNodePickerViewModel = viewModel(factory = ExitNodePickerViewModelFactory(nav))
4445
) {
45-
LoadingIndicator.Wrap {
46+
LoadingIndicator.Wrap {
4647
Scaffold(topBar = { Header(R.string.choose_exit_node, onBack = nav.onNavigateBackHome) }) {
4748
innerPadding ->
4849
val tailnetExitNodes by model.tailnetExitNodes.collectAsState()
@@ -99,7 +100,8 @@ fun ExitNodePicker(
99100
}
100101
}
101102

102-
if (!allowLanAccessMDMDisposition.value.hiddenFromUser) {
103+
// https://developer.android.com/reference/android/net/VpnService.Builder#excludeRoute(android.net.IpPrefix) - excludeRoute is only supported in API 33+, so don't show the option if allow LAN access is not enabled.
104+
if (!allowLanAccessMDMDisposition.value.hiddenFromUser && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
103105
item(key = "allowLANAccess") {
104106
Lists.SectionDivider()
105107

0 commit comments

Comments
 (0)