Merge pull request googlesamples#4 from calumma-robert/master

Fixes & Improvements

Author: Thaina

GoogleSignIn/Future.cs

@@ -55,14 +55,14 @@ internal Future(FutureAPIImpl<T> impl) {
     /// Gets the status.
     /// </summary>
     /// <value>The status is set when Pending == false.</value>
-    GoogleSignInStatusCode Status { get { return apiImpl.Status; } }
+    public GoogleSignInStatusCode Status { get { return apiImpl.Status; } }
 
     /// <summary>
     /// Gets the result.
     /// </summary>
     /// <value>The result is set when Pending == false and there is no error.
     /// </value>
-    T Result { get { return apiImpl.Result; } }
+    public T Result { get { return apiImpl.Result; } }
 
     /// <summary>
     /// Waits for result then completes the TaskCompleationSource.
@@ -71,6 +71,21 @@ internal Future(FutureAPIImpl<T> impl) {
     /// <param name="tcs">Tcs.</param>
     internal IEnumerator WaitForResult(TaskCompletionSource<T> tcs) {
       yield return new WaitUntil(() => !Pending);
+      yield return null;
+      if (Status == GoogleSignInStatusCode.CANCELED) {
+        tcs.SetCanceled();
+      } else if (Status == GoogleSignInStatusCode.SUCCESS ||
+            Status == GoogleSignInStatusCode.SUCCESS_CACHE) {
+        tcs.SetResult(Result);
+      } else {
+        tcs.SetException(new GoogleSignIn.SignInException(Status));
+      }
+    }
+
+    internal async Task WaitForResultAsync(TaskCompletionSource<T> tcs)
+    {
+      while (Pending) await Task.Yield();
+      await Task.Yield();
       if (Status == GoogleSignInStatusCode.CANCELED) {
         tcs.SetCanceled();
       } else if (Status == GoogleSignInStatusCode.SUCCESS ||
@@ -81,4 +96,4 @@ internal IEnumerator WaitForResult(TaskCompletionSource<T> tcs) {
       }
     }
   }
-}
+}

GoogleSignIn/GoogleSignIn.cs

@@ -123,6 +123,14 @@ public Task<GoogleSignInUser> SignIn() {
       return tcs.Task;
     }
 
+    public Task<GoogleSignInUser> SignInAsync() {
+      var tcs = new TaskCompletionSource<GoogleSignInUser>();
+      impl.SignIn().WaitForResultAsync(tcs);
+      return tcs.Task;
+    }
+
+    public Future<GoogleSignInUser> SignInFuture() => impl.SignIn();
+
     /// <summary>Starts the silent authentication process.</summary>
     /// <remarks>
     /// The authenication process is started and will attempt to sign in without
@@ -136,6 +144,14 @@ public Task<GoogleSignInUser> SignInSilently() {
       return tcs.Task;
     }
 
+    public Task<GoogleSignInUser> SignInSilentlyAsync() {
+      var tcs = new TaskCompletionSource<GoogleSignInUser>();
+      impl.SignInSilently().WaitForResultAsync(tcs);
+      return tcs.Task;
+    }
+
+    public Future<GoogleSignInUser> SignInSilentlyFuture() => impl.SignInSilently();
+
     /// <summary>
     /// Signs out the User.
     /// </summary>

GoogleSignIn/Impl/GoogleSignInImpl.cs

@@ -1,4 +1,5 @@
-// <copyright file="GoogleSignInImpl.cs" company="Google Inc.">
+#if UNITY_EDITOR || UNITY_ANDROID || UNITY_IOS
+// <copyright file="GoogleSignInImpl.cs" company="Google Inc.">
 // Copyright (C) 2017 Google Inc. All Rights Reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -141,7 +142,7 @@ public void OnResult(int result, AndroidJavaObject acct)
             Debug.Log("googlesignin.IListener : " + acct.Call<string>("toString"));
             Debug.Log("ID : " + acct.Call<string>("getId"));
         }
-        else Debug.LogError("Should not get null account");
+        else Debug.LogWarning("Should not get null account");
       }
     }
 
@@ -334,11 +335,10 @@ public static class Ext
     public static AndroidJavaObject ToAndroidJavaObject(in this HandleRef self) => self.Handle.ToAndroidJavaObject();
     public static AndroidJavaObject ToAndroidJavaObject(in this IntPtr intPtr)
     {
-      if(intPtr == IntPtr.Zero)
+      if (intPtr == IntPtr.Zero)
         return null;
 
-      try
-      {
+      try {
 #if UNITY_2022_2_OR_NEWER
         return new AndroidJavaObject(intPtr);
 #else
@@ -348,13 +348,11 @@ public static AndroidJavaObject ToAndroidJavaObject(in this IntPtr intPtr)
         Debug.LogFormat("constructorInfo : {0}",constructorInfo);
         return constructorInfo.Invoke(new object[] { intPtr }) as AndroidJavaObject;
 #endif
+      } catch (Exception e) {
+        Debug.LogError("Exception creating AndroidJavaObject: " + e);
+        return null;
       }
-      catch(Exception e)
-      {
-        Debug.LogException(e);
-      }
-
-      return null;
     }
   }
 }
+#endif

GoogleSignIn/Impl/GoogleSignInImplEditor.cs

@@ -62,6 +62,8 @@ static HttpListener BindLocalHostFirstAvailablePort()
 #if UNITY_EDITOR_WIN
       var listeners = IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners();
       return Enumerable.Range(minPort, ushort.MaxValue - minPort).Where((i) => !listeners.Any((x) => x.Port == i)).Select((port) => {
+#elif UNITY_EDITOR_OSX
+      return Enumerable.Range(minPort, ushort.MaxValue - minPort).Select((port) => {
 #else
       return Enumerable.Range(0,10).Select((i) => UnityEngine.Random.Range(minPort,ushort.MaxValue)).Select((port) => {
 #endif

GoogleSignIn/Impl/NativeFuture.cs

@@ -1,4 +1,5 @@
-// <copyright file="NativeFuture.cs" company="Google Inc.">
+#if UNITY_EDITOR || UNITY_ANDROID || UNITY_IOS
+// <copyright file="NativeFuture.cs" company="Google Inc.">
 // Copyright (C) 2017 Google Inc. All Rights Reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -87,3 +88,4 @@ public GoogleSignInStatusCode Status {
     }
   }
 }
+#endif

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

@@ -70,13 +70,16 @@ public void onResult(@NonNull GoogleSignInResult googleSignInResult) {
           return;
         }
 
+        GoogleSignInFragment.this.tokenResult = new TokenResult(googleSignInResult.getSignInAccount(), googleSignInResult.getStatus().getStatusCode());
+
         Status status = googleSignInResult.getStatus();
         GoogleSignInAccount acct = googleSignInResult.isSuccess() ? googleSignInResult.getSignInAccount() : null;
         if (acct == null) {
           GoogleSignInHelper.logError("Error with silentSignIn: " + status);
         }
 
         GoogleSignInHelper.nativeOnResult(request.getHandle(),status != null ? status.getStatusCode() : CommonStatusCodes.INTERNAL_ERROR,acct);
+        request.cancel();
         setState(State.READY);
       }
     });
@@ -122,6 +125,7 @@ public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
   }
 
   public void disconnect() {
+    this.tokenResult = null;
     this.tokenPendingResult = null;
     if (mGoogleApiClient != null) {
       mGoogleApiClient.disconnect();
@@ -156,16 +160,23 @@ public TokenRequest getRequest() {
     return request;
   }
 
+  private TokenResult tokenResult = null;
   private PendingResult<TokenResult> tokenPendingResult = null;
 
   public GoogleSignInAccount getAccount() {
+    if (tokenResult != null)
+      return tokenResult.getAccount();
+
     if(tokenPendingResult == null || tokenPendingResult.isCanceled())
       return null;
 
     return tokenPendingResult.await(3,TimeUnit.SECONDS).getAccount();
   }
 
   public int getStatus() {
+    if (tokenResult != null)
+      return tokenResult.getStatus().getStatusCode();
+
     if(tokenPendingResult == null) {
       return CommonStatusCodes.DEVELOPER_ERROR;
     }
@@ -207,6 +218,7 @@ public static GoogleSignInFragment getInstance(Activity parentActivity) {
   public synchronized boolean submitRequest(TokenRequest request) {
     if (this.request == null || this.state == State.READY) {
       this.request = request;
+      this.tokenResult = null;
       this.tokenPendingResult = request.getPendingResponse();
       return true;
     }
@@ -230,6 +242,7 @@ private synchronized void setState(State state) {
    */
   public void signOut() {
     clearRequest(true);
+    this.tokenResult = null;
     this.tokenPendingResult = null;
     if (mGoogleApiClient != null) {
       Auth.GoogleSignInApi.signOut(mGoogleApiClient);
@@ -303,6 +316,7 @@ private void processRequest(final boolean silent) {
       request.getPendingResponse().setResultCallback(new ResultCallback<TokenResult>() {
         @Override
         public void onResult(@NonNull TokenResult tokenResult) {
+          GoogleSignInFragment.this.tokenResult = tokenResult;
           GoogleSignInHelper.logDebug(
                   String.format(
                           Locale.getDefault(),
@@ -314,7 +328,8 @@ public void onResult(@NonNull TokenResult tokenResult) {
                   tokenResult.getHandle(),
                   tokenResult.getStatus().getStatusCode(),
                   tokenResult.getAccount());
-          clearRequest(false);
+          request.cancel();
+          setState(State.READY);
         }
       });
 

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

@@ -22,6 +22,7 @@
 import com.google.android.gms.common.api.ResultCallback;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.Locale;
 
 /**
  * Pending result class for TokenResult. This allows the pending result to be returned to the
@@ -41,6 +42,12 @@ public TokenPendingResult(IListener requestHandle) {
     result = new TokenResult();
     result.setHandle(requestHandle);
   }
+    
+  @Override
+  public String toString() {
+    return String.format(
+        Locale.getDefault(), "Pending Result: %s", (result == null) ? "<null>" : result);
+  }
 
   @Override
   public TokenResult await() {

package.json

@@ -1,7 +1,7 @@
 {
     "name": "com.google.signin",
     "displayName": "Google Signin",
-    "version": "0.8.0",
+    "version": "0.8.3",
     "unity": "2021.3",
     "description": "Google Signin for android, ios ,desktop",
     "keywords": [
@@ -19,4 +19,4 @@
             "path": "Samples~/SignInSample"
         }
     ]
-}
+}