From 91d4d47fd89f47a6c60820959f0ad07924b98597 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 24 Jul 2020 20:39:44 +0200 Subject: [PATCH] cmd/tailscale: stop loader indicator when Google Sign-in is cancelled Signed-off-by: Elias Naur --- android/src/main/java/com/tailscale/ipn/Peer.java | 2 ++ cmd/tailscale/main.go | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/android/src/main/java/com/tailscale/ipn/Peer.java b/android/src/main/java/com/tailscale/ipn/Peer.java index 5260f07..6ec8a08 100644 --- a/android/src/main/java/com/tailscale/ipn/Peer.java +++ b/android/src/main/java/com/tailscale/ipn/Peer.java @@ -35,6 +35,8 @@ public class Peer extends Fragment { GoogleSignInAccount acc = GoogleSignIn.getLastSignedInAccount(getActivity()); onSignin(acc.getIdToken()); return; + } else { + onSignin(null); } case REQUEST_PREPARE_VPN: if (resultCode == Activity.RESULT_OK) { diff --git a/cmd/tailscale/main.go b/cmd/tailscale/main.go index e57ce65..36f5ec3 100644 --- a/cmd/tailscale/main.go +++ b/cmd/tailscale/main.go @@ -435,12 +435,14 @@ func (a *App) runUI() error { requestBackend(ConnectEvent{Enable: false}) case tok := <-onGoogleToken: ui.signinType = noSignin - requestBackend(OAuth2Event{ - Token: &oauth2.Token{ - AccessToken: tok, - TokenType: ipn.GoogleIDTokenType, - }, - }) + if tok != "" { + requestBackend(OAuth2Event{ + Token: &oauth2.Token{ + AccessToken: tok, + TokenType: ipn.GoogleIDTokenType, + }, + }) + } case <-a.updates: a.mu.Lock() oldState := state.backend.State