Merge pull request #210 from Simperium/update-password-length

Update Password Length

Author: mchowning

Simperium/src/main/java/com/simperium/android/CredentialsActivity.java

@@ -18,7 +18,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatButton;
@@ -41,13 +40,14 @@
 import static com.simperium.android.AuthenticationActivity.EXTRA_IS_LOGIN;
 
 public class CredentialsActivity extends AppCompatActivity {
-    private static final Pattern PATTERN_PASSWORD = Pattern.compile("^(.){4,}$", Pattern.DOTALL);
     private static final Pattern PATTERN_WHITESPACE = Pattern.compile("(\\s)");
     private static final String EXTRA_AUTOMATE_LOGIN = "EXTRA_AUTOMATE_LOGIN";
     private static final String EXTRA_PASSWORD = "EXTRA_PASSWORD";
     private static final String STATE_EMAIL = "STATE_EMAIL";
     private static final String STATE_PASSWORD = "STATE_PASSWORD";
     private static final int DELAY_AUTOMATE_LOGIN = 600;
+    private static final int PASSWORD_LENGTH_LOGIN = 4;
+    private static final int PASSWORD_LENGTH_SIGNUP = 6;
 
     protected ProgressDialogFragment mProgressDialogFragment;
 
@@ -70,11 +70,11 @@ public void run() {
                                 break;
                             case INVALID_ACCOUNT:
                             default:
-                                showDialogError(
+                                showDialogError(getString(
                                     mIsLogin ?
                                         R.string.simperium_dialog_message_login :
                                         R.string.simperium_dialog_message_signup
-                                );
+                                ));
                         }
 
                         Logger.log(error.getMessage(), error);
@@ -165,7 +165,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
                 new View.OnFocusChangeListener() {
                     @Override
                     public void onFocusChange(View view, boolean hasFocus) {
-                        if (!hasFocus && !isValid(Patterns.EMAIL_ADDRESS, mInputEmail.getEditText().getText().toString())) {
+                        if (!hasFocus && !isValidEmail(mInputEmail.getEditText().getText().toString())) {
                             mInputEmail.setError(getString(R.string.simperium_error_email));
                         } else {
                             mInputEmail.setError("");
@@ -202,10 +202,10 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
                 new View.OnFocusChangeListener() {
                     @Override
                     public void onFocusChange(View view, boolean hasFocus) {
-                        if (!hasFocus && !isValid(PATTERN_PASSWORD, mInputPassword.getEditText().getText().toString())) {
-                            mInputPassword.setError(getString(R.string.simperium_error_password));
-                        } else {
+                        if (hasFocus) {
                             mInputPassword.setError("");
+                        } else if (!isValidPasswordLength()) {
+                            mInputPassword.setError(getString(R.string.simperium_error_password));
                         }
                     }
                 }
@@ -228,7 +228,7 @@ public void onClick(View view) {
                             startSignup();
                         }
                     } else {
-                        showDialogError(R.string.simperium_dialog_message_network);
+                        showDialogError(getString(R.string.simperium_dialog_message_network));
                     }
                 }
             }
@@ -311,20 +311,28 @@ private void hideDialogProgress() {
         }
     }
 
-    private boolean isValid(Pattern pattern, String text) {
-        return pattern.matcher(text).matches();
+    private boolean isValidEmail(String text) {
+        return Patterns.EMAIL_ADDRESS.matcher(text).matches();
     }
-    
+
     private boolean isValidPassword(String password) {
-        return password.length() >= 4 && !PATTERN_WHITESPACE.matcher(password).find();
+        return isValidPasswordLength() && !PATTERN_WHITESPACE.matcher(password).find();
+    }
+
+    private boolean isValidPasswordLength() {
+        return mInputPassword.getEditText() != null &&
+            (mIsLogin ?
+                mInputPassword.getEditText().getText().toString().length() >= PASSWORD_LENGTH_LOGIN :
+                mInputPassword.getEditText().getText().toString().length() >= PASSWORD_LENGTH_SIGNUP
+            );
     }
 
     private void setButtonState() {
         mButton.setEnabled(
             mInputEmail.getEditText() != null &&
             mInputPassword.getEditText() != null &&
-            isValid(Patterns.EMAIL_ADDRESS, mInputEmail.getEditText().getText().toString()) &&
-            isValid(PATTERN_PASSWORD, mInputPassword.getEditText().getText().toString())
+            isValidEmail(mInputEmail.getEditText().getText().toString()) &&
+            isValidPasswordLength()
         );
     }
 
@@ -334,7 +342,7 @@ private void setEditTextString(@NonNull TextInputLayout inputLayout, String text
         }
     }
 
-    private void showDialogError(@StringRes int message) {
+    private void showDialogError(String message) {
         hideDialogProgress();
         Context context = new ContextThemeWrapper(CredentialsActivity.this, getTheme());
         new AlertDialog.Builder(context)
@@ -378,7 +386,7 @@ private void startLogin() {
             mProgressDialogFragment.show(getSupportFragmentManager(), ProgressDialogFragment.TAG);
             mSimperium.authorizeUser(email, password, mAuthListener);
         } else {
-            showDialogError(R.string.simperium_dialog_message_password);
+            showDialogError(getString(R.string.simperium_dialog_message_password, PASSWORD_LENGTH_LOGIN));
         }
     }
 
@@ -392,7 +400,7 @@ private void startSignup() {
             mProgressDialogFragment.show(getSupportFragmentManager(), ProgressDialogFragment.TAG);
             mSimperium.createUser(email, password, mAuthListener);
         } else {
-            showDialogError(R.string.simperium_dialog_message_password);
+            showDialogError(getString(R.string.simperium_dialog_message_password, PASSWORD_LENGTH_SIGNUP));
         }
     }
 }

Simperium/src/main/res/values/strings.xml

@@ -10,7 +10,7 @@
     <string name="simperium_button_signup">Sign Up</string>
     <string name="simperium_dialog_message_login">Could not log in with the provided email address and password.</string>
     <string name="simperium_dialog_message_network">There is no network available.  Please, connect to a network and try again.</string>
-    <string name="simperium_dialog_message_password">Passwords must be a minimum of four characters excluding new lines, spaces, and tabs.</string>
+    <string name="simperium_dialog_message_password">Passwords must be a minimum of %1$d characters excluding new lines, spaces, and tabs.</string>
     <string name="simperium_dialog_message_signup">Could not sign up with the provided email address and password.</string>
     <string name="simperium_dialog_message_signup_existing">The email address you entered is already associated with a Simperium account.</string>
     <string name="simperium_dialog_progress_logging_in">Logging in&#8230;</string>

build.gradle

@@ -35,5 +35,5 @@ def gitDescribe() {
 }
 
 def static gitVersion() {
-    '0.8.0'
+    '0.9.0'
 }