Convert java API to be static, as instance API will not let us signIn repeatedly

Author: Thaina

GoogleSignIn/Impl/GoogleSignInImpl.cs

@@ -109,7 +109,7 @@ static bool GoogleSignIn_Configure(HandleRef googleSignInHelper,
 		bool requestIdToken, bool hidePopups, string[] additionalScopes,
 		int scopeCount, string accountName)
 	{
-		googleSignInHelper.ToAndroidJavaObject().Call("configure",
+		GoogleSignInHelper.CallStatic("configure",
 			useGameSignIn,
 			webClientId,
 			requestAuthCode,
@@ -159,12 +159,12 @@ public void onCanceled() {
 
 	static IntPtr GoogleSignIn_SignIn(HandleRef self)
 	{
-		return self.ToAndroidJavaObject().Call<AndroidJavaObject>("signIn").GetRawObject();
+		return GoogleSignInHelper.CallStatic<AndroidJavaObject>("signIn").GetRawObject();
 	}
 
 	static IntPtr GoogleSignIn_SignInSilently(HandleRef self)
 	{
-		return self.ToAndroidJavaObject().Call<AndroidJavaObject>("signInSilently").GetRawObject();
+		return GoogleSignInHelper.CallStatic<AndroidJavaObject>("signInSilently").GetRawObject();
 	}
 
 	static void GoogleSignIn_Signout(HandleRef self)
@@ -175,18 +175,18 @@ static void GoogleSignIn_Signout(HandleRef self)
 		authorizationResult?.Dispose();
 		authorizationResult = null;
 
-		self.ToAndroidJavaObject().Call("signOut");
+		GoogleSignInHelper.CallStatic("signOut");
 	}
 
 	static void GoogleSignIn_Disconnect(HandleRef self) => throw new NotImplementedException();
 
-	internal static void GoogleSignIn_DisposeFuture(HandleRef self) => self.ToAndroidJavaObject()?.Call("cancel");
+	internal static void GoogleSignIn_DisposeFuture(HandleRef self) => GoogleSignInHelper.CallStatic("cancel");
 
-	internal static bool GoogleSignIn_Pending(HandleRef self) => self.ToAndroidJavaObject()?.Call<bool>("isPending") ?? false;
+	internal static bool GoogleSignIn_Pending(HandleRef self) => GoogleSignInHelper.CallStatic<bool>("isPending");
 
-	internal static IntPtr GoogleSignIn_Result(HandleRef self) => self.Handle;
+	internal static IntPtr GoogleSignIn_Result(HandleRef self) => googleIdTokenCredential.GetRawObject();
 
-	internal static int GoogleSignIn_Status(HandleRef self) => self.ToAndroidJavaObject()?.Call<int>("getStatus") ?? 6;
+	internal static int GoogleSignIn_Status(HandleRef self) => GoogleSignInHelper.CallStatic<int>("getStatus");
 
 	internal static string GoogleSignIn_GetServerAuthCode(HandleRef self) => authorizationResult?.Call<string>("getServerAuthCode");
 

Plugins/Android/src/main/java/com/google/googlesignin/GoogleSignInHelper.java

@@ -15,8 +15,6 @@
  */
 package com.google.googlesignin;
 
-import android.app.Activity;
-import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.util.Log;
 
@@ -37,10 +35,8 @@
 import com.google.android.gms.common.api.CommonStatusCodes;
 import com.google.android.gms.common.api.Scope;
 import com.google.android.gms.common.util.Strings;
-import com.google.android.gms.tasks.CancellationToken;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.android.gms.tasks.OnTokenCanceledListener;
 import com.google.android.gms.tasks.SuccessContinuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
@@ -73,14 +69,14 @@ public static void enableDebugLogging(boolean flag) {
     loggingEnabled = flag;
   }
 
-  private CancellationSignal cancellationSignal;
-  private Task<AuthorizationResult> task;
-  private Function<Boolean, Task<AuthorizationResult>> signInFunction;
-  public boolean isPending() {
+  private static CancellationSignal cancellationSignal;
+  private static Task<AuthorizationResult> task;
+  private static Function<Boolean, Task<AuthorizationResult>> signInFunction;
+  public static boolean isPending() {
     return task != null && !task.isComplete() && !task.isCanceled();
   }
 
-  public int getStatus() {
+  public static int getStatus() {
     if(signInFunction == null)
       return CommonStatusCodes.DEVELOPER_ERROR;
 
@@ -125,7 +121,7 @@ public int getStatus() {
    *                           C++ code, this is used
    *                           to correlate the response with the request.
    */
-  public void configure(
+  public static void configure(
           boolean useGamesConfig,
           String webClientId,
           boolean requestAuthCode,
@@ -208,7 +204,7 @@ public Task<AuthorizationResult> then(GetCredentialResponse getCredentialRespons
               authorizationRequestBuilder.requestOfflineAccess(webClientId, forceRefreshToken);
 
             int additionalCount = additionalScopes != null ? additionalScopes.length : 0;
-            List<Scope> scopes = new ArrayList<>(3 + additionalCount);
+            List<Scope> scopes = new ArrayList<>(2 + additionalCount);
             scopes.add(new Scope(Scopes.PROFILE));
             if (requestEmail)
               scopes.add(new Scope(Scopes.EMAIL));
@@ -238,17 +234,17 @@ public void onComplete(@NonNull Task<AuthorizationResult> _unused) {
     };
   }
 
-  public GoogleSignInHelper signIn() {
+  public static Task<AuthorizationResult> signIn() {
     task = signInFunction.apply(false);
-    return this;
+    return task;
   }
 
-  public GoogleSignInHelper signInSilently() {
+  public static Task<AuthorizationResult> signInSilently() {
     task = signInFunction.apply(true);
-    return this;
+    return task;
   }
 
-  public void cancel() {
+  public static void cancel() {
     if(isPending() && cancellationSignal != null){
       cancellationSignal.cancel();
       cancellationSignal = null;
@@ -257,7 +253,7 @@ public void cancel() {
     task = null;
   }
 
-  public void signOut() {
+  public static void signOut() {
     cancel();
 
     CredentialManager.create(UnityPlayer.currentActivity).clearCredentialStateAsync(new ClearCredentialStateRequest(),