From 71c91e6ffc4474a23e7e0266bdd9c84e08f25839 Mon Sep 17 00:00:00 2001 From: kari-ts Date: Wed, 27 Mar 2024 14:41:27 -0700 Subject: [PATCH] MainView, strings: show toggle when logged out Fix logged out strings Updates tailscale/corp#18202 Signed-off-by: kari-ts --- android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt | 2 +- android/src/main/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt index c973b93..924f1d5 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt @@ -91,7 +91,7 @@ fun MainView(navigation: MainViewNavigation, viewModel: MainViewModel = viewMode .padding(top = 10.dp), verticalAlignment = Alignment.CenterVertically) { val isOn = viewModel.vpnToggleState.collectAsState(initial = false) - if (state.value != Ipn.State.NeedsLogin && state.value != Ipn.State.NoState) { + if (state.value != Ipn.State.NoState) { TintedSwitch(onCheckedChange = { viewModel.toggleVpn() }, checked = isOn.value) Spacer(Modifier.size(3.dp)) } diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 1348bad..e8228ae 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -67,7 +67,7 @@ Loading… -- - Please Login + Login Required Stopped