Skip to content

Commit f55c73b

Browse files
samtsternsamtstern
committed
Respond to SUPERCILEX review feedback
Change-Id: I6eac4c2e92c13b1e5ad9a2953441566ad2d7c29e
1 parent c8b5ed9 commit f55c73b

17 files changed

+66
-53
lines changed

‎auth/src/main/java/com/firebase/ui/auth/AuthUI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ public T setAvailableProviders(@NonNull List<IdpConfig> idpConfigs) {
453453

454454
if (config.getProviderId().equals(FACEBOOK_PROVIDER)) {
455455
try {
456-
Class c = com.facebook.FacebookCallback.class;
456+
Class c = com.facebook.FacebookSdk.class;
457457
} catch (NoClassDefFoundError e) {
458458
throw new RuntimeException("Facebook provider cannot be configured " +
459459
"without dependency. Did you forget to add " +

‎auth/src/main/java/com/firebase/ui/auth/IdpResponse.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,14 @@ public String getEmail() {
100100
return mEmail;
101101
}
102102

103+
/**
104+
* Get the phone number used to sign in.
105+
*/
106+
@Nullable
107+
public String getPhoneNumber() {
108+
return mPhoneNumber;
109+
}
110+
103111
/**
104112
* Get the token received as a result of logging in with the specified IDP
105113
*/

‎auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.content.Intent;
66
import android.support.annotation.LayoutRes;
77

8+
import com.firebase.ui.auth.AuthUI;
89
import com.firebase.ui.auth.R;
910
import com.firebase.ui.auth.ResultCodes;
1011
import com.firebase.ui.auth.ui.BaseHelper;
@@ -28,6 +29,7 @@ public String getName(Context context) {
2829
}
2930

3031
@Override
32+
@AuthUI.SupportedProvider
3133
public String getProviderId() {
3234
return EmailAuthProvider.PROVIDER_ID;
3335
}

‎auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import android.app.Activity;
44
import android.content.Context;
55
import android.content.Intent;
6+
import android.support.annotation.LayoutRes;
67

8+
import com.firebase.ui.auth.AuthUI;
79
import com.firebase.ui.auth.R;
810
import com.firebase.ui.auth.ResultCodes;
911
import com.firebase.ui.auth.ui.BaseHelper;
@@ -28,11 +30,13 @@ public String getName(Context context) {
2830
}
2931

3032
@Override
33+
@AuthUI.SupportedProvider
3134
public String getProviderId() {
3235
return PhoneAuthProvider.PROVIDER_ID;
3336
}
3437

3538
@Override
39+
@LayoutRes
3640
public int getButtonLayout() {
3741
return R.layout.provider_button_phone;
3842
}

‎auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ public static void initialize(Context context) {
5555

5656
public static void signout(Context context) {
5757
try {
58-
signOut();
58+
Twitter.getInstance();
5959
} catch (IllegalStateException e) {
6060
initialize(context);
61-
signOut();
6261
}
62+
63+
signOut();
6364
}
6465

6566
@Override

‎auth/src/main/java/com/firebase/ui/auth/ui/FragmentHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class FragmentHelper extends BaseHelper {
1313
private Fragment mFragment;
1414

1515
public FragmentHelper(Fragment fragment) {
16-
super(fragment.getContext(),
16+
super(fragment.getContext().getApplicationContext(),
1717
(FlowParameters) fragment.getArguments().getParcelable(ExtraConstants.EXTRA_FLOW_PARAMS));
1818
mFragment = fragment;
1919
}

‎auth/src/main/java/com/firebase/ui/auth/ui/TermsTextView.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import android.content.Context;
1818
import android.support.annotation.StringRes;
19+
import android.support.v7.widget.AppCompatTextView;
1920
import android.util.AttributeSet;
2021

2122
import com.firebase.ui.auth.ui.email.PreambleHandler;
@@ -25,7 +26,7 @@
2526
* The view helps display TOS linking to the provided custom URI.
2627
* It handles the styling of the link and opens the uri in a CustomTabs on click.
2728
*/
28-
public class TermsTextView extends android.support.v7.widget.AppCompatTextView {
29+
public class TermsTextView extends AppCompatTextView {
2930
public TermsTextView(Context context) {
3031
super(context);
3132
}

‎auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import android.content.Context;
2222
import android.content.DialogInterface;
2323
import android.os.AsyncTask;
24+
import android.support.annotation.VisibleForTesting;
2425
import android.support.v7.widget.AppCompatEditText;
2526
import android.text.TextUtils;
2627
import android.util.AttributeSet;
@@ -53,9 +54,7 @@ public CountryListSpinner(Context context, AttributeSet attrs, int defStyle) {
5354
init();
5455
}
5556

56-
/**
57-
* Only for Testing
58-
*/
57+
@VisibleForTesting
5958
void setDialogPopup(DialogPopup dialog) {
6059
this.dialogPopup = dialog;
6160
}

‎auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected void onCreate(final Bundle savedInstance) {
100100
}
101101

102102
String phone = getIntent().getExtras().getString(ExtraConstants.EXTRA_PHONE);
103-
VerifyPhoneNumberFragment fragment = VerifyPhoneNumberFragment.getInstance
103+
VerifyPhoneNumberFragment fragment = VerifyPhoneNumberFragment.newInstance
104104
(mActivityHelper.getFlowParams(), phone);
105105
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_verify_phone,
106106
fragment, VerifyPhoneNumberFragment.TAG).disallowAddToBackStack().commit();
@@ -274,7 +274,7 @@ protected AlertDialog getAlertDialog() {
274274
private void showSubmitCodeFragment() {
275275
// idempotent function
276276
if (getSubmitConfirmationCodeFragment() == null) {
277-
SubmitConfirmationCodeFragment f = SubmitConfirmationCodeFragment.getInstance
277+
SubmitConfirmationCodeFragment f = SubmitConfirmationCodeFragment.newInstance
278278
(mActivityHelper.getFlowParams(), mPhoneNumber);
279279
FragmentTransaction t = getSupportFragmentManager().beginTransaction().replace(R.id
280280
.fragment_verify_phone, f, SubmitConfirmationCodeFragment.TAG).addToBackStack

‎auth/src/main/java/com/firebase/ui/auth/ui/phone/SpacedEditText.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import android.content.Context;
2222
import android.content.res.TypedArray;
23+
import android.support.v7.widget.AppCompatEditText;
2324
import android.text.Editable;
2425
import android.text.Spannable;
2526
import android.text.SpannableStringBuilder;
@@ -33,7 +34,7 @@
3334
* spaces using spannables.
3435
* This is required since Android's letter spacing is not available until API 21.
3536
*/
36-
public final class SpacedEditText extends android.support.v7.widget.AppCompatEditText {
37+
public final class SpacedEditText extends AppCompatEditText {
3738
private float proportion;
3839
private SpannableStringBuilder originalText;
3940

‎auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,17 @@ public class SubmitConfirmationCodeFragment extends FragmentBase {
4646
private static final long RESEND_WAIT_MILLIS = 15000;
4747
private static final String EXTRA_MILLIS_UNTIL_FINISHED = "EXTRA_MILLIS_UNTIL_FINISHED";
4848

49-
TextView mEditPhoneTextView;
50-
TextView mResendCodeTextView;
51-
TextView mCountDownTextView;
52-
SpacedEditText mConfirmationCodeEditText;
53-
Button mSubmitConfirmationButton;
54-
CustomCountDownTimer mCountdownTimer;
55-
PhoneVerificationActivity mVerifier;
56-
TermsTextView mAgreementText;
57-
long mMillisUntilFinished;
58-
59-
60-
61-
public static SubmitConfirmationCodeFragment getInstance(FlowParameters flowParameters,
49+
private TextView mEditPhoneTextView;
50+
private TextView mResendCodeTextView;
51+
private TextView mCountDownTextView;
52+
private SpacedEditText mConfirmationCodeEditText;
53+
private Button mSubmitConfirmationButton;
54+
private CustomCountDownTimer mCountdownTimer;
55+
private PhoneVerificationActivity mVerifier;
56+
private TermsTextView mAgreementText;
57+
private long mMillisUntilFinished;
58+
59+
public static SubmitConfirmationCodeFragment newInstance(FlowParameters flowParameters,
6260
String phoneNumber) {
6361
SubmitConfirmationCodeFragment fragment = new SubmitConfirmationCodeFragment();
6462

‎auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@
5252
public class VerifyPhoneNumberFragment extends FragmentBase implements View.OnClickListener {
5353
public static final String TAG = "VerifyPhoneFragment";
5454

55-
CountryListSpinner countryListSpinner;
56-
EditText mPhoneEditText;
57-
TextView errorEditText;
58-
Button sendCodeButton;
59-
PhoneVerificationActivity mVerifier;
60-
TextView mSmsTermsText;
55+
private CountryListSpinner countryListSpinner;
56+
private EditText mPhoneEditText;
57+
private TextView errorEditText;
58+
private Button sendCodeButton;
59+
private PhoneVerificationActivity mVerifier;
60+
private TextView mSmsTermsText;
6161

6262
private static final int RC_PHONE_HINT = 22;
6363

64-
public static VerifyPhoneNumberFragment getInstance(FlowParameters flowParameters, String
65-
phone) {
64+
public static VerifyPhoneNumberFragment newInstance(FlowParameters flowParameters,
65+
String phone) {
6666
VerifyPhoneNumberFragment fragment = new VerifyPhoneNumberFragment();
6767

6868
Bundle args = new Bundle();

‎auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public void onConnected(Bundle bundle) {
9393
finish();
9494
return;
9595
}
96+
9697
Credential.Builder builder = new Credential.Builder(mEmail);
9798
builder.setPassword(mPassword);
9899
if (mPassword == null && mResponse != null) {

‎auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SmartLockBase.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public static String providerIdToAccountType(@AuthUI.SupportedProvider @NonNull
5555
case EmailAuthProvider.PROVIDER_ID:
5656
// The account type for email/password creds is null
5757
return null;
58+
case PhoneAuthProvider.PROVIDER_ID:
59+
// The account type for phone creds is null
60+
return null;
5861
default:
5962
return null;
6063
}

‎auth/src/test/java/com/firebase/ui/auth/testhelpers/ActivityHelperShadow.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import com.firebase.ui.auth.ui.ActivityHelper;
1818
import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
19-
import com.google.firebase.auth.PhoneAuthProvider;
2019

2120
import org.robolectric.annotation.Implementation;
2221
import org.robolectric.annotation.Implements;

‎auth/src/test/java/com/firebase/ui/auth/testhelpers/TestConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
public class TestConstants {
2020
public static final String EMAIL = "[email protected]";
21-
public static final String PHONE = "+14347565353";
21+
public static final String PHONE = "+15555555555";
2222
public static final String PASSWORD = "hunter2";
2323
public static final String NAME = "Test Testerson";
2424
public static final String TOKEN = "token";

‎auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ public static FlowParameters getFlowParameters(List<String> providerIds) {
7070
}
7171

7272
public static void verifySmartLockSave(String providerId, String email, String password) {
73+
verifySmartLockSave(providerId, email, password, null);
74+
}
75+
76+
public static void verifySmartLockSave(String providerId, String email,
77+
String password, String phoneNumber) {
78+
7379
ArgumentCaptor<FirebaseUser> userCaptor = ArgumentCaptor.forClass(FirebaseUser.class);
7480
ArgumentCaptor<String> passwordCaptor = ArgumentCaptor.forClass(String.class);
7581
ArgumentCaptor<IdpResponse> idpResponseCaptor = ArgumentCaptor.forClass(IdpResponse.class);
@@ -79,30 +85,20 @@ public static void verifySmartLockSave(String providerId, String email, String p
7985
passwordCaptor.capture(),
8086
idpResponseCaptor.capture());
8187

88+
// Check email and password
8289
assertEquals(email, userCaptor.getValue().getEmail());
8390
assertEquals(password, passwordCaptor.getValue());
84-
assertEquals(providerId, idpResponseCaptor.getValue().getProviderType());
85-
}
8691

87-
public static void verifySmartLockSave(String providerId, String email, String phoneNumber,
88-
String password) {
89-
ArgumentCaptor<FirebaseUser> userArgumentCaptor =
90-
ArgumentCaptor.forClass(FirebaseUser.class);
91-
ArgumentCaptor<IdpResponse> idpResponseArgumentCaptor =
92-
ArgumentCaptor.forClass(IdpResponse.class);
93-
ArgumentCaptor<String> passwordArgumentCaptor = ArgumentCaptor.forClass(String.class);
94-
verify(ActivityHelperShadow.sSaveSmartLock)
95-
.saveCredentialsOrFinish(userArgumentCaptor.capture(),
96-
passwordArgumentCaptor.capture(), idpResponseArgumentCaptor.capture());
97-
assertEquals(email, userArgumentCaptor.getValue().getEmail());
98-
assertEquals(phoneNumber, userArgumentCaptor.getValue().getPhoneNumber());
99-
assertEquals(password, passwordArgumentCaptor.getValue());
92+
// Check phone number (if necessary)
93+
if (phoneNumber != null) {
94+
assertEquals(phoneNumber, userCaptor.getValue().getPhoneNumber());
95+
}
96+
97+
// Check provider id
10098
if (providerId == null) {
101-
assertNull(idpResponseArgumentCaptor.getValue());
99+
assertNull(idpResponseCaptor.getValue());
102100
} else {
103-
assertEquals(
104-
providerId,
105-
idpResponseArgumentCaptor.getValue().getProviderType());
101+
assertEquals(providerId, idpResponseCaptor.getValue().getProviderType());
106102
}
107103
}
108104
}

0 commit comments

Comments
 (0)