diff --git a/Makefile b/Makefile index b1f2c5d..1ceb0fb 100644 --- a/Makefile +++ b/Makefile @@ -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 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 7499fc0..36c1cbc 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)