|
17 | 17 | import android.content.Intent;
|
18 | 18 | import android.support.annotation.NonNull;
|
19 | 19 |
|
| 20 | +import android.util.Log; |
20 | 21 | import com.firebase.ui.auth.R;
|
21 | 22 | import com.firebase.ui.auth.ui.account_link.WelcomeBackIdpPrompt;
|
22 | 23 | import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
|
@@ -80,30 +81,22 @@ private void startEmailHandler(String email, List<String> providers) {
|
80 | 81 | mActivityHelper.startActivityForResult(registerIntent, RC_REGISTER_ACCOUNT);
|
81 | 82 | } else {
|
82 | 83 | // account does exist
|
83 |
| - for (String provider : providers) { |
84 |
| - if (provider.equalsIgnoreCase(EmailAuthProvider.PROVIDER_ID)) { |
85 |
| - Intent signInIntent = SignInActivity.createIntent( |
86 |
| - mActivityHelper.getApplicationContext(), |
87 |
| - mActivityHelper.getFlowParams(), |
88 |
| - email); |
89 |
| - mActivityHelper.startActivityForResult(signInIntent, RC_SIGN_IN); |
90 |
| - return; |
91 |
| - } |
92 |
| - |
93 |
| - Intent intent = WelcomeBackIdpPrompt.createIntent( |
| 84 | + String provider = providers.get(0); |
| 85 | + if (provider.equalsIgnoreCase(EmailAuthProvider.PROVIDER_ID)) { |
| 86 | + Intent signInIntent = SignInActivity.createIntent( |
94 | 87 | mActivityHelper.getApplicationContext(),
|
95 | 88 | mActivityHelper.getFlowParams(),
|
96 |
| - provider, |
97 |
| - null, |
98 | 89 | email);
|
| 90 | + mActivityHelper.startActivityForResult(signInIntent, RC_SIGN_IN); |
| 91 | + } else { |
| 92 | + Intent intent = WelcomeBackIdpPrompt.createIntent( |
| 93 | + mActivityHelper.getApplicationContext(), |
| 94 | + mActivityHelper.getFlowParams(), |
| 95 | + provider, |
| 96 | + null, |
| 97 | + email); |
99 | 98 | mActivityHelper.startActivityForResult(intent, RC_WELCOME_BACK_IDP);
|
100 |
| - return; |
101 | 99 | }
|
102 |
| - |
103 |
| - Intent signInIntent = new Intent( |
104 |
| - mActivityHelper.getApplicationContext(), SignInActivity.class); |
105 |
| - signInIntent.putExtra(ExtraConstants.EXTRA_EMAIL, email); |
106 |
| - mActivityHelper.startActivityForResult(signInIntent, RC_SIGN_IN); |
107 | 100 | }
|
108 | 101 | }
|
109 | 102 |
|
|
0 commit comments