Skip to content

Commit c7e445f

Browse files
Iain McGinnissGerrit Code Review
authored andcommitted
Merge "Checkstyle fixes for AuthMethodPickerActivity"
2 parents d0d0641 + 88570a7 commit c7e445f

File tree

1 file changed

+34
-23
lines changed

1 file changed

+34
-23
lines changed

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

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,42 +37,37 @@
3737

3838
import java.util.ArrayList;
3939

40+
/**
41+
* Presents the list of authentication options for this app to the user.
42+
*/
4043
public class AuthMethodPickerActivity
4144
extends IDPBaseActivity
4245
implements IDPProvider.IDPCallback, View.OnClickListener {
4346

4447
private static final String TAG = "AuthMethodPicker";
4548
private ArrayList<IDPProviderParcel> mProviderParcels;
46-
private ArrayList<IDPProvider> mIDPProviders;
49+
private ArrayList<IDPProvider> mIdpProviders;
4750

4851
@Override
4952
protected void onCreate(Bundle savedInstanceState) {
5053
super.onCreate(savedInstanceState);
5154
setContentView(R.layout.nascar_layout);
5255
Button emailButton = (Button) findViewById(R.id.email_provider);
5356
emailButton.setOnClickListener(this);
54-
mProviderParcels = getIntent().getParcelableArrayListExtra(ControllerConstants.EXTRA_PROVIDERS);
55-
populateIDPList(mProviderParcels);
56-
}
57-
58-
public static Intent createIntent(
59-
Context context, String appName, ArrayList<IDPProviderParcel> parcels) {
60-
return new Intent()
61-
.setClass(context, AuthMethodPickerActivity.class)
62-
.putExtra(ControllerConstants.EXTRA_APP_NAME, appName)
63-
.putParcelableArrayListExtra(ControllerConstants.EXTRA_PROVIDERS, parcels)
64-
.putExtra(EXTRA_ID, IDPController.NASCAR_SCREEN);
57+
mProviderParcels =
58+
getIntent().getParcelableArrayListExtra(ControllerConstants.EXTRA_PROVIDERS);
59+
populateIdpList(mProviderParcels);
6560
}
6661

67-
private void populateIDPList(ArrayList<IDPProviderParcel> mProviders) {
68-
mIDPProviders = new ArrayList<>();
69-
for (IDPProviderParcel providerParcel : mProviders) {
62+
private void populateIdpList(ArrayList<IDPProviderParcel> providers) {
63+
mIdpProviders = new ArrayList<>();
64+
for (IDPProviderParcel providerParcel : providers) {
7065
switch (providerParcel.getProviderType()) {
7166
case FacebookAuthProvider.PROVIDER_ID :
72-
mIDPProviders.add(new FacebookProvider(this, providerParcel));
67+
mIdpProviders.add(new FacebookProvider(this, providerParcel));
7368
break;
7469
case GoogleAuthProvider.PROVIDER_ID:
75-
mIDPProviders.add(new GoogleProvider(this, providerParcel));
70+
mIdpProviders.add(new GoogleProvider(this, providerParcel));
7671
break;
7772
case EmailAuthProvider.PROVIDER_ID:
7873
findViewById(R.id.email_provider).setVisibility(View.VISIBLE);
@@ -85,7 +80,7 @@ private void populateIDPList(ArrayList<IDPProviderParcel> mProviders) {
8580
}
8681
}
8782
LinearLayout btnHolder = (LinearLayout) findViewById(R.id.btn_holder);
88-
for(final IDPProvider provider: mIDPProviders) {
83+
for (final IDPProvider provider: mIdpProviders) {
8984
View loginButton = null;
9085
switch (provider.getProviderId()) {
9186
case GoogleAuthProvider.PROVIDER_ID:
@@ -116,8 +111,8 @@ public void onClick(View view) {
116111
@Override
117112
public void onActivityResult(int requestCode, int resultCode, Intent data) {
118113
super.onActivityResult(requestCode, resultCode, data);
119-
for(IDPProvider provider : mIDPProviders) {
120-
provider.onActivityResult(requestCode, resultCode, data);
114+
for (IDPProvider provider : mIdpProviders) {
115+
provider.onActivityResult(requestCode, resultCode, data);
121116
}
122117
}
123118

@@ -135,9 +130,25 @@ public void onFailure(Bundle extra) {
135130
}
136131

137132
@Override
138-
public void onClick(View v) {
139-
if (v.getId() == R.id.email_provider) {
140-
finish(IDPBaseActivity.EMAIL_LOGIN_NEEDED, new Intent());
133+
public void onClick(View view) {
134+
if (view.getId() == R.id.email_provider) {
135+
finish(IDPBaseActivity.EMAIL_LOGIN_NEEDED, new Intent());
141136
}
142137
}
138+
139+
/**
140+
* Creates an intent to start the authentication picker activity with the required information.
141+
* @param context The context of the activity which intends to start the picker.
142+
* @param appName The Firebase application name.
143+
* @param parcels The supported provider descriptors.
144+
* @return The intent to start the authentication picker activity.
145+
*/
146+
public static Intent createIntent(
147+
Context context, String appName, ArrayList<IDPProviderParcel> parcels) {
148+
return new Intent()
149+
.setClass(context, AuthMethodPickerActivity.class)
150+
.putExtra(ControllerConstants.EXTRA_APP_NAME, appName)
151+
.putParcelableArrayListExtra(ControllerConstants.EXTRA_PROVIDERS, parcels)
152+
.putExtra(EXTRA_ID, IDPController.NASCAR_SCREEN);
153+
}
143154
}

0 commit comments

Comments
 (0)