add timeout to await for silentSignIn

Author: Thaina

GoogleSignIn/Impl/GoogleSignInImpl.cs

@@ -161,29 +161,29 @@ static IntPtr GoogleSignIn_SignInSilently(HandleRef self)
 
     static void GoogleSignIn_Disconnect(HandleRef self) => GoogleSignInHelper.CallStatic("disconnect",parentActivity);
 
-    internal static void GoogleSignIn_DisposeFuture(HandleRef self) => self.ToAndroidJavaObject().Dispose();
+    internal static void GoogleSignIn_DisposeFuture(HandleRef self) => self.ToAndroidJavaObject()?.Dispose();
 
-    internal static bool GoogleSignIn_Pending(HandleRef self) => self.ToAndroidJavaObject().Call<bool>("isPending");
+    internal static bool GoogleSignIn_Pending(HandleRef self) => self.ToAndroidJavaObject()?.Call<bool>("isPending") ?? false;
 
-    internal static IntPtr GoogleSignIn_Result(HandleRef self) => self.ToAndroidJavaObject().Call<AndroidJavaObject>("getAccount").GetRawObject();
+    internal static IntPtr GoogleSignIn_Result(HandleRef self) => self.ToAndroidJavaObject()?.Call<AndroidJavaObject>("getAccount")?.GetRawObject() ?? IntPtr.Zero;
 
-    internal static int GoogleSignIn_Status(HandleRef self) => self.ToAndroidJavaObject().Call<int>("getStatus");
+    internal static int GoogleSignIn_Status(HandleRef self) => self.ToAndroidJavaObject()?.Call<int>("getStatus") ?? -1;
 
-    internal static string GoogleSignIn_GetServerAuthCode(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getServerAuthCode");
+    internal static string GoogleSignIn_GetServerAuthCode(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getServerAuthCode");
 
-    internal static string GoogleSignIn_GetDisplayName(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getDisplayName");
+    internal static string GoogleSignIn_GetDisplayName(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getDisplayName");
 
-    internal static string GoogleSignIn_GetEmail(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getEmail");
+    internal static string GoogleSignIn_GetEmail(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getEmail");
 
-    internal static string GoogleSignIn_GetFamilyName(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getFamilyName");
+    internal static string GoogleSignIn_GetFamilyName(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getFamilyName");
 
-    internal static string GoogleSignIn_GetGivenName(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getGivenName");
+    internal static string GoogleSignIn_GetGivenName(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getGivenName");
 
-    internal static string GoogleSignIn_GetIdToken(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getIdToken");
+    internal static string GoogleSignIn_GetIdToken(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getIdToken");
 
-    internal static string GoogleSignIn_GetImageUrl(HandleRef self) => self.ToAndroidJavaObject().Call<AndroidJavaObject>("getPhotoUrl").Call<string>("toString");
+    internal static string GoogleSignIn_GetImageUrl(HandleRef self) => self.ToAndroidJavaObject()?.Call<AndroidJavaObject>("getPhotoUrl")?.Call<string>("toString");
 
-    internal static string GoogleSignIn_GetUserId(HandleRef self) => self.ToAndroidJavaObject().Call<string>("getId");
+    internal static string GoogleSignIn_GetUserId(HandleRef self) => self.ToAndroidJavaObject()?.Call<string>("getId");
 #else
     private const string DllName = "__Internal";
 
@@ -334,6 +334,9 @@ 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)
+        return null;
+
 #if UNITY_2022_2_OR_NEWER
       return new AndroidJavaObject(intPtr);
 #else

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

@@ -35,10 +35,12 @@
 import com.google.android.gms.common.api.PendingResult;
 import com.google.android.gms.common.api.ResultCallback;
 import com.google.android.gms.common.api.Scope;
+import com.google.android.gms.common.api.Status;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Locale;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Activity fragment with no UI added to the parent activity in order to manage the accessing of the
@@ -62,15 +64,19 @@ void DoSignIn(boolean silent) {
     Auth.GoogleSignInApi.silentSignIn(mGoogleApiClient).setResultCallback(new ResultCallback<GoogleSignInResult>() {
       @Override
       public void onResult(@NonNull GoogleSignInResult googleSignInResult) {
-        if (!googleSignInResult.isSuccess()) {
-          GoogleSignInHelper.logError(
-            "Error with " + "silentSignIn: " + googleSignInResult.getStatus());
+        if(googleSignInResult == null) {
+          GoogleSignInHelper.logError("Error with silentSignIn: googleSignInResult is null");
+          GoogleSignInHelper.nativeOnResult(request.getHandle(),CommonStatusCodes.INTERNAL_ERROR,null);
+          return;
         }
 
-        GoogleSignInHelper.nativeOnResult(
-          request.getHandle(),
-          googleSignInResult.getStatus().getStatusCode(),
-          googleSignInResult.getSignInAccount());
+        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);
         setState(State.READY);
       }
     });
@@ -153,15 +159,22 @@ public TokenRequest getRequest() {
   private PendingResult<TokenResult> tokenPendingResult = null;
 
   public GoogleSignInAccount getAccount() {
-    return tokenPendingResult.await().getAccount();
+    if(tokenPendingResult == null || tokenPendingResult.isCanceled())
+      return null;
+
+    return tokenPendingResult.await(3,TimeUnit.SECONDS).getAccount();
   }
 
   public int getStatus() {
     if(tokenPendingResult == null) {
       return CommonStatusCodes.DEVELOPER_ERROR;
     }
 
-    return tokenPendingResult.await().getStatus().getStatusCode();
+    if(tokenPendingResult.isCanceled()) {
+      return CommonStatusCodes.CANCELED;
+    }
+
+    return tokenPendingResult.await(3,TimeUnit.SECONDS).getStatus().getStatusCode();
   }
 
   private GoogleApiClient mGoogleApiClient;
@@ -287,34 +300,29 @@ private void processRequest(final boolean silent) {
       }
 
       setState(State.BUSY);
-      request
-              .getPendingResponse()
-              .setResultCallback(
-                      new ResultCallback<TokenResult>() {
-                        @Override
-                        public void onResult(@NonNull TokenResult tokenResult) {
-                          GoogleSignInHelper.logDebug(
-                                  String.format(
-                                          Locale.getDefault(),
-                                          "Calling nativeOnResult: handle: %s, status: %d acct: %s",
-                                          tokenResult.getHandle(),
-                                          tokenResult.getStatus().getStatusCode(),
-                                          tokenResult.getAccount()));
-                          GoogleSignInHelper.nativeOnResult(
-                                  tokenResult.getHandle(),
-                                  tokenResult.getStatus().getStatusCode(),
-                                  tokenResult.getAccount());
-                          clearRequest(false);
-                        }
-                      });
+      request.getPendingResponse().setResultCallback(new ResultCallback<TokenResult>() {
+        @Override
+        public void onResult(@NonNull TokenResult tokenResult) {
+          GoogleSignInHelper.logDebug(
+                  String.format(
+                          Locale.getDefault(),
+                          "Calling nativeOnResult: handle: %s, status: %d acct: %s",
+                          tokenResult.getHandle(),
+                          tokenResult.getStatus().getStatusCode(),
+                          tokenResult.getAccount()));
+          GoogleSignInHelper.nativeOnResult(
+                  tokenResult.getHandle(),
+                  tokenResult.getStatus().getStatusCode(),
+                  tokenResult.getAccount());
+          clearRequest(false);
+        }
+      });
 
       // Build the GoogleAPIClient
       buildClient(request);
 
-      GoogleSignInHelper.logDebug(
-              " Has connected == " + mGoogleApiClient.hasConnectedApi(Auth.GOOGLE_SIGN_IN_API));
+      GoogleSignInHelper.logDebug(" Has connected == " + mGoogleApiClient.hasConnectedApi(Auth.GOOGLE_SIGN_IN_API));
       if (!mGoogleApiClient.hasConnectedApi(Auth.GOOGLE_SIGN_IN_API)) {
-
         DoSignIn(silent);
       }
     } catch (Throwable throwable) {