Skip to content

Commit 932cb3d

Browse files
authored
Clean up the logic around starting the linking flow (#377)
1 parent 8b2503f commit 932cb3d

File tree

1 file changed

+12
-19
lines changed

1 file changed

+12
-19
lines changed

auth/src/main/java/com/firebase/ui/auth/ui/AcquireEmailHelper.java

+12-19
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import android.content.Intent;
1818
import android.support.annotation.NonNull;
1919

20+
import android.util.Log;
2021
import com.firebase.ui.auth.R;
2122
import com.firebase.ui.auth.ui.account_link.WelcomeBackIdpPrompt;
2223
import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
@@ -80,30 +81,22 @@ private void startEmailHandler(String email, List<String> providers) {
8081
mActivityHelper.startActivityForResult(registerIntent, RC_REGISTER_ACCOUNT);
8182
} else {
8283
// 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(
9487
mActivityHelper.getApplicationContext(),
9588
mActivityHelper.getFlowParams(),
96-
provider,
97-
null,
9889
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);
9998
mActivityHelper.startActivityForResult(intent, RC_WELCOME_BACK_IDP);
100-
return;
10199
}
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);
107100
}
108101
}
109102

0 commit comments

Comments
 (0)