From c48dae5ef7e42044ddea8d00d61545cb4aae2f89 Mon Sep 17 00:00:00 2001 From: kari-ts Date: Tue, 5 Nov 2024 13:07:41 -0800 Subject: [PATCH] android: show hex code for TV log in Remove flag gating the display of a hex code for Android TV users, now that the change allowing hex code input in the admin console is merged. Fixes tailscale/tailscale#13277 Signed-off-by: kari-ts --- .../ipn/ui/viewModel/LoginQRViewModel.kt | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/android/src/main/java/com/tailscale/ipn/ui/viewModel/LoginQRViewModel.kt b/android/src/main/java/com/tailscale/ipn/ui/viewModel/LoginQRViewModel.kt index 7499fc0c0f..36c1cbcd69 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/viewModel/LoginQRViewModel.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/viewModel/LoginQRViewModel.kt @@ -23,7 +23,6 @@ class LoginQRViewModel : IpnViewModel() { val numCode: StateFlow = MutableStateFlow(null) val qrCode: StateFlow = MutableStateFlow(null) // Remove this once changes to admin console allowing input code to be entered are made. - val codeEnabled = false init { viewModelScope.launch { @@ -31,17 +30,15 @@ class LoginQRViewModel : IpnViewModel() { url?.let { qrCode.set(generateQRCode(url, 200, 0)) - if (codeEnabled) { - // Extract the string after "https://login.tailscale.com/a/" - val prefix = "https://login.tailscale.com/a/" - val code = - if (it.startsWith(prefix)) { - it.removePrefix(prefix) - } else { - null - } - numCode.set(code) - } + // Extract the string after "https://login.tailscale.com/a/" + val prefix = "https://login.tailscale.com/a/" + val code = + if (it.startsWith(prefix)) { + it.removePrefix(prefix) + } else { + null + } + numCode.set(code) } ?: run { qrCode.set(null)