android: show hex code for TV log in (#557)

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 <kari@tailscale.com>
kari-ts 1 year ago committed by kari-ts
parent 4c4148bd8e
commit f2050b29dc

@ -127,7 +127,7 @@ tailscale-test.apk: gradle-dependencies
(cd android && ./gradlew assembleApplicationTestAndroidTest)
install -C ./android/build/outputs/apk/androidTest/applicationTest/android-applicationTest-androidTest.apk $@
tailscale.version: go.mod go.sum $(wildcard .git/HEAD)
tailscale.version: go.mod go.sum .git/HEAD .git/refs .git/packed-refs .git/index
$(shell ./tool/go run tailscale.com/cmd/mkversion > tailscale.version)
.PHONY: version

@ -23,7 +23,6 @@ class LoginQRViewModel : IpnViewModel() {
val numCode: StateFlow<String?> = MutableStateFlow(null)
val qrCode: StateFlow<ImageBitmap?> = 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)

Loading…
Cancel
Save