Add GetSignInWithGoogleOption for sign in manually flow

Author: Thaina

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

@@ -46,6 +46,7 @@
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.TaskExecutors;
 import com.google.android.libraries.identity.googleid.GetGoogleIdOption;
+import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption;
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential;
 import com.unity3d.player.UnityPlayer;
 
@@ -150,19 +151,26 @@ public Task<AuthorizationResult> apply(@NonNull Boolean silent) {
 
         CancellationSignal signal = cancellationSignal;
 
-        GetGoogleIdOption.Builder getGoogleIdOptionBuilder = new GetGoogleIdOption.Builder()
-                .setFilterByAuthorizedAccounts(silent)
-                .setAutoSelectEnabled(hideUiPopups);
+        GetCredentialRequest.Builder getCredentialRequestBuilder = new GetCredentialRequest.Builder()
+                .setPreferImmediatelyAvailableCredentials(hideUiPopups);
+        
+        if(silent) {
+          GetGoogleIdOption.Builder getGoogleIdOptionBuilder = new GetGoogleIdOption.Builder()
+                  .setFilterByAuthorizedAccounts(false)
+                  .setAutoSelectEnabled(hideUiPopups);
 
-        if(defaultAccountName != null)
-          getGoogleIdOptionBuilder.setNonce(defaultAccountName);
+          if(defaultAccountName != null)
+            getGoogleIdOptionBuilder.setNonce(defaultAccountName);
 
-        if(!Strings.isEmptyOrWhitespace(webClientId))
-          getGoogleIdOptionBuilder.setServerClientId(webClientId);
+          if(!Strings.isEmptyOrWhitespace(webClientId))
+            getGoogleIdOptionBuilder.setServerClientId(webClientId);
 
-        GetCredentialRequest.Builder getCredentialRequestBuilder = new GetCredentialRequest.Builder()
-                .addCredentialOption(getGoogleIdOptionBuilder.build())
-                .setPreferImmediatelyAvailableCredentials(hideUiPopups);
+          getCredentialRequestBuilder.addCredentialOption(getGoogleIdOptionBuilder.build());
+        }
+        else {
+          GetSignInWithGoogleOption.Builder getSignInWithGoogleOptionBuilder = new GetSignInWithGoogleOption.Builder(webClientId);
+          getCredentialRequestBuilder.addCredentialOption(getSignInWithGoogleOptionBuilder.build());
+        }
 
         TaskCompletionSource<GetCredentialResponse> source = new TaskCompletionSource<>();