Skip to content

Commit 151a332

Browse files
author
josefhruska
committed
Fix validators
1 parent b3f68ae commit 151a332

File tree

5 files changed

+8
-26
lines changed

5 files changed

+8
-26
lines changed

auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ private void showEmailAutoCompleteHint() {
253253

254254
private void checkEmailValid() {
255255
if (getView() != null && mEmailFieldValidator != null) {
256-
if (!mEmailFieldValidator.isValid()) {
256+
if (!mEmailFieldValidator.isValid(mEmailEditText.getText().toString())) {
257257
getView().findViewById(R.id.button_next).setBackgroundColor(ContextCompat.getColor(getContext(), R.color.sign_up_disabled));
258258
} else {
259259
getView().findViewById(R.id.button_next).setBackgroundColor(ContextCompat.getColor(getContext(), R.color.authui_colorAccent));

auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public void onClick(View view) {
277277
private void checkAllFieldsValid() {
278278
if (getView() != null) {
279279
TextView buttonSignUp = (TextView) getView().findViewById(R.id.button_create);
280-
if (mEmailFieldValidator.isValid() && mPasswordFieldValidator.isValid() && mNameValidator.isValid()) {
280+
if (mEmailFieldValidator.isValid(mEmailEditText.getText().toString()) && mPasswordFieldValidator.isValid(mPasswordEditText.getText().toString()) && mNameValidator.isValid(mNameEditText.getText().toString())) {
281281
buttonSignUp.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.authui_colorAccent));
282282
} else if (buttonSignUp != null) {
283283
buttonSignUp.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.sign_up_disabled));

auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/EmailFieldValidator.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,15 @@
2222

2323
public class EmailFieldValidator extends BaseValidator {
2424

25-
private Boolean mIsValid = false;
26-
2725
public EmailFieldValidator(TextInputLayout errorContainer) {
2826
super(errorContainer);
2927
mErrorMessage = mErrorContainer.getResources().getString(R.string.invalid_email_address);
3028
mEmptyMessage = mErrorContainer.getResources().getString(R.string.missing_email_address);
3129
}
3230

3331
@Override
34-
protected boolean isValid(CharSequence charSequence) {
35-
mIsValid = Patterns.EMAIL_ADDRESS.matcher(charSequence).matches();
36-
return mIsValid;
32+
public boolean isValid(CharSequence charSequence) {
33+
return Patterns.EMAIL_ADDRESS.matcher(charSequence).matches();
3734
}
3835

39-
public boolean isValid() {
40-
return mIsValid;
41-
}
4236
}

auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020

2121
public class PasswordFieldValidator extends BaseValidator {
2222
private int mMinLength;
23-
private Boolean mIsValid = false;
24-
2523

2624
public PasswordFieldValidator(TextInputLayout errorContainer, int minLength) {
2725
super(errorContainer);
@@ -31,12 +29,8 @@ public PasswordFieldValidator(TextInputLayout errorContainer, int minLength) {
3129
}
3230

3331
@Override
34-
protected boolean isValid(CharSequence charSequence) {
35-
mIsValid = charSequence.length() >= mMinLength;
36-
return mIsValid;
32+
public boolean isValid(CharSequence charSequence) {
33+
return charSequence.length() >= mMinLength;
3734
}
3835

39-
public boolean isValid() {
40-
return mIsValid;
41-
}
4236
}

auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/RequiredFieldValidator.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,14 @@
2020

2121
public class RequiredFieldValidator extends BaseValidator {
2222

23-
private Boolean mIsValid = false;
24-
2523
public RequiredFieldValidator(TextInputLayout errorContainer) {
2624
super(errorContainer);
2725
mErrorMessage = mErrorContainer.getResources().getString(R.string.required_field);
2826
}
2927

3028
@Override
31-
protected boolean isValid(CharSequence charSequence) {
32-
mIsValid = charSequence != null && charSequence.length() > 0;
33-
return mIsValid;
29+
public boolean isValid(CharSequence charSequence) {
30+
return charSequence != null && charSequence.length() > 0;
3431
}
3532

36-
public boolean isValid() {
37-
return mIsValid;
38-
}
3933
}

0 commit comments

Comments
 (0)