Fixes

Author: calumma-robert

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);
         }
       });
 

package.json

@@ -2,7 +2,7 @@
     "name": "com.google.signin",
     "displayName": "Google Signin",
     "author": "Robert Lehmann",
-    "version": "0.8.2",
+    "version": "0.8.3",
     "unity": "2021.3",
     "description": "Google Signin for android, ios ,desktop",
     "keywords": [