From facf6406c3dd3bde171506796f311b4fb907bb67 Mon Sep 17 00:00:00 2001
From: kari-ts <135075563+kari-ts@users.noreply.github.com>
Date: Wed, 27 Mar 2024 16:49:29 -0700
Subject: [PATCH] Clean up Google sign in (#258)

This is unnecessary; we are just using browser login

Updates tailscale/corp#18202

Signed-off-by: kari-ts <kari@tailscale.com>
---
 .../java/com/tailscale/ipn/MainActivity.kt    |  2 -
 .../src/main/java/com/tailscale/ipn/Peer.java | 23 +++-------
 .../play/java/com/tailscale/ipn/Google.java   | 43 -------------------
 3 files changed, 7 insertions(+), 61 deletions(-)
 delete mode 100644 android/src/play/java/com/tailscale/ipn/Google.java

diff --git a/android/src/main/java/com/tailscale/ipn/MainActivity.kt b/android/src/main/java/com/tailscale/ipn/MainActivity.kt
index fc68ef6..0d89aab 100644
--- a/android/src/main/java/com/tailscale/ipn/MainActivity.kt
+++ b/android/src/main/java/com/tailscale/ipn/MainActivity.kt
@@ -59,8 +59,6 @@ class MainActivity : ComponentActivity() {
 
   companion object {
     // Request codes for Android callbacks.
-    // requestSignin is for Google Sign-In.
-    @JvmStatic val requestSignin: Int = 1000
     // requestPrepareVPN is for when Android's VpnService.prepare completes.
     @JvmStatic val requestPrepareVPN: Int = 1001
 
diff --git a/android/src/main/java/com/tailscale/ipn/Peer.java b/android/src/main/java/com/tailscale/ipn/Peer.java
index 6fca3f2..5f87a0e 100644
--- a/android/src/main/java/com/tailscale/ipn/Peer.java
+++ b/android/src/main/java/com/tailscale/ipn/Peer.java
@@ -11,27 +11,18 @@ public class Peer extends Fragment {
     private static int resultOK = -1;
 
     public class RequestCodes {
-        public static final int requestSignin = 1000;
         public static final int requestPrepareVPN = 1001;
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-            case RequestCodes.requestSignin:
-                if (resultCode != resultOK) {
-                    // TODO: send null Google token
-                    break;
-                }
-                // TODO: send Google token
-            case RequestCodes.requestPrepareVPN:
-                if (resultCode == resultOK) {
-                    App.getApplication().startVPN();
-                } else {
-                    App.getApplication().setWantRunning(false);
-                    // notify VPN revoked
-                }
-
+        if (requestCode == RequestCodes.requestPrepareVPN) {
+            if (resultCode == resultOK) {
+                App.getApplication().startVPN();
+            } else {
+                App.getApplication().setWantRunning(false);
+                // notify VPN revoked
+            }
         }
     }
 }
diff --git a/android/src/play/java/com/tailscale/ipn/Google.java b/android/src/play/java/com/tailscale/ipn/Google.java
deleted file mode 100644
index 86fd893..0000000
--- a/android/src/play/java/com/tailscale/ipn/Google.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Tailscale Inc & AUTHORS
-// SPDX-License-Identifier: BSD-3-Clause
-
-package com.tailscale.ipn;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.Context;
-
-import com.google.android.gms.auth.api.signin.GoogleSignIn;
-import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
-import com.google.android.gms.auth.api.signin.GoogleSignInClient;
-import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
-
-// Google implements helpers for Google services.
-public final class Google {
-    static String getIdTokenForActivity(Activity act) {
-        GoogleSignInAccount acc = GoogleSignIn.getLastSignedInAccount(act);
-        return acc.getIdToken();
-    }
-
-    static void googleSignIn(Activity act, String serverOAuthID, int reqCode) {
-        act.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-                        .requestIdToken(serverOAuthID)
-                        .requestEmail()
-                        .build();
-                GoogleSignInClient client = GoogleSignIn.getClient(act, gso);
-                Intent signInIntent = client.getSignInIntent();
-                App.startActivityForResult(act, signInIntent, reqCode);
-            }
-        });
-    }
-
-    static void googleSignOut(Context ctx) {
-        GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-                .build();
-        GoogleSignInClient client = GoogleSignIn.getClient(ctx, gso);
-        client.signOut();
-    }
-}