more fixes

Author: Lyokone

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -140,7 +140,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         });
 
         mBinding.signIn.setOnClickListener(view -> signIn());
-        
+
         if (ConfigurationUtils.isGoogleMisconfigured(this)
                 || ConfigurationUtils.isFacebookMisconfigured(this)) {
             showSnackbar(R.string.configuration_required);
@@ -224,6 +224,8 @@ private Intent getSignInIntent(@Nullable String link) {
         if (auth.getCurrentUser() != null && auth.getCurrentUser().isAnonymous()) {
             builder.enableAnonymousUsersAutoUpgrade();
         }
+
+        builder.setAlwaysShowSignInMethodScreen(true);
         return builder.build();
     }
 

auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java

@@ -224,6 +224,7 @@ private void attemptCredentialSignIn() {
                 requestBuilder.setGoogleIdTokenRequestOptions(
                         BeginSignInRequest.GoogleIdTokenRequestOptions.builder()
                                 .setSupported(true)
+                                .setServerClientId(getString(R.string.default_web_client_id))
                                 .build());
             }
             BeginSignInRequest signInRequest = requestBuilder.build();