password validation done for special character

app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinViewModel.java

@@ -163,7 +163,7 @@ public class ChangePassNPinViewModel extends BaseViewModel implements ChangePass
 
 
         boolean isCurrentPasswordValid(CharSequence password) {
-            if(password!=null && password.toString().trim().matches("^(?=.*[A-Z])(?=.*[0-9]).{8,24}$")){
+            if(password!=null && password.toString().trim().matches(Constants.PASSWORD_PATTERN)){
                 this.currentPassword = password.toString();
                 changePassNPinLiveData.setCurrentPasswordInputLiveData(new FormInputStateDTO<>(true, null));
                 return true;
@@ -176,7 +176,7 @@ public class ChangePassNPinViewModel extends BaseViewModel implements ChangePass
 
 
         boolean isNewPasswordValid(CharSequence password) {
-            if(password!=null && password.toString().trim().matches("^(?=.*[A-Z])(?=.*[0-9]).{8,24}$")){
+            if(password!=null && password.toString().trim().matches(Constants.PASSWORD_PATTERN)){
                 this.newPassword = password.toString();
                 changePassNPinLiveData.setNewPasswordInputLiveData(new FormInputStateDTO<>(true, null));
                 return true;
@@ -189,7 +189,7 @@ public class ChangePassNPinViewModel extends BaseViewModel implements ChangePass
         }
 
         boolean isConfirmPasswordValid(CharSequence password) {
-            if(password!=null && password.toString().trim().matches("^(?=.*[A-Z])(?=.*[0-9]).{8,24}$")){
+            if(password!=null && password.toString().trim().matches(Constants.PASSWORD_PATTERN)){
                 this.confirmPassword = password.toString();
                 changePassNPinLiveData.setConfirmPasswordInputLiveData(new FormInputStateDTO<>(true, null));
                 return true;

app/src/main/java/com/swifttech/remit/jmecustomer/features/changepassword/presenter/ChangePasswordV2Presenter.java

@@ -103,7 +103,7 @@ public class ChangePasswordV2Presenter extends BaseViewModel implements ChangePa
         private String confirmPassword;
 
         boolean isCurrentPasswordValid(CharSequence password) {
-            if(password!=null && password.toString().trim().matches("^(?=.*[A-Z])(?=.*[0-9]).{8,24}$")){
+            if(password!=null && password.toString().trim().matches(Constants.PASSWORD_PATTERN)){
                 this.currentPassword = password.toString();
                 changePasswordLiveData.setCurrentPasswordInputLiveData(new FormInputStateDTO<>(true, null));
                 return true;
@@ -117,7 +117,7 @@ public class ChangePasswordV2Presenter extends BaseViewModel implements ChangePa
 
 
         boolean isNewPasswordValid(CharSequence password) {
-            if(password!=null && password.toString().trim().matches("^(?=.*[A-Z])(?=.*[0-9]).{8,24}$")){
+            if(password!=null && password.toString().trim().matches(Constants.PASSWORD_PATTERN)){
                 this.newPassword = password.toString();
                 changePasswordLiveData.setNewPasswordInputLiveData(new FormInputStateDTO<>(true, null));
                 return true;
@@ -130,7 +130,7 @@ public class ChangePasswordV2Presenter extends BaseViewModel implements ChangePa
         }
 
         boolean isConfirmPasswordValid(CharSequence password) {
-            if(password!=null && password.toString().trim().matches("^(?=.*[A-Z])(?=.*[0-9]).{8,24}$")){
+            if(password!=null && password.toString().trim().matches(Constants.PASSWORD_PATTERN)){
                 this.confirmPassword = password.toString();
                 changePasswordLiveData.setConfirmPasswordInputLiveData(new FormInputStateDTO<>(true, null));
                 return true;

app/src/main/java/com/swifttech/remit/jmecustomer/features/login/presenter/LoginV2ViewModel.java

@@ -208,7 +208,7 @@ public class LoginV2ViewModel extends BaseViewModel implements LoginV2PresenterI
         }
 
         private boolean validatePassword(CharSequence password) {
-            if (password != null && password.toString().trim().matches("^(?=.*[A-Z])(?=.*[0-9]).{8,24}$")) {
+            if (password != null && password.toString().trim().matches(Constants.PASSWORD_PATTERN)) {
                 loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(true, ""));
                 this.password = password.toString();
                 return true;

app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java

@@ -399,7 +399,7 @@ public class ExistingCustomerRegisterViewModel extends BaseViewModel implements
         }
 
         public boolean validatePassword(CharSequence password) {
-            if (password != null && password.toString().trim().matches("^(?=.*[A-Z])(?=.*[0-9]).{8,24}$")) {
+            if (password != null && password.toString().trim().matches(Constants.PASSWORD_PATTERN)) {
                 existingRegisterSubmitViewLiveData.setNewPasswordInputLiveData(new FormInputStateDTO<>(true, ""));
                 this.password = password.toString();
                 return true;
@@ -411,7 +411,7 @@ public class ExistingCustomerRegisterViewModel extends BaseViewModel implements
         }
 
         public boolean validateConfirmPassword(CharSequence password) {
-            if (password != null && password.toString().trim().matches("^(?=.*[A-Z])(?=.*[0-9]).{8,24}$")) {
+            if (password != null && password.toString().trim().matches(Constants.PASSWORD_PATTERN)) {
                 existingRegisterSubmitViewLiveData.setConfirmPasswordInputLiveData(new FormInputStateDTO<>(true, ""));
                 this.confirmPassword = password.toString();
                 return true;

app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/presenter/NewRegisterV2Presenter.java

@@ -341,7 +341,7 @@ public class NewRegisterV2Presenter extends BaseViewModel implements NewRegister
         }
 
         private boolean validatePassword(CharSequence password) {
-            if (password != null && password.toString().trim().matches("^(?=.*[A-Z])(?=.*[0-9]).{8,24}$")) {
+            if (password != null && password.toString().trim().matches(Constants.PASSWORD_PATTERN)) {
                 newExistingRegisterViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(true, ""));
                 this.password = password.toString();
                 return true;
@@ -353,7 +353,7 @@ public class NewRegisterV2Presenter extends BaseViewModel implements NewRegister
         }
 
         public boolean validateConfirmPassword(CharSequence password) {
-            if (password != null && password.toString().trim().matches("^(?=.*[A-Z])(?=.*[0-9]).{8,24}$")) {
+            if (password != null && password.toString().trim().matches(Constants.PASSWORD_PATTERN)) {
                 newExistingRegisterViewLiveData.setConfirmPasswordInputLiveData(new FormInputStateDTO<>(true, ""));
                 this.confirmPassword = password.toString();
                 return true;

app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/newcustomer/view/NewRegisterV2Activity.java

@@ -143,6 +143,7 @@ public class NewRegisterV2Activity extends BaseActivity implements NewRegisterV2
     }
 
     private void initialize() {
+        residenceId_edTxt.setFilters(new InputFilter[] {new InputFilter.AllCaps()});
         this.presenter = new ViewModelProvider(this, new NewRegisterViewModelFactory(this)).get(NewRegisterV2Presenter.class);
         registerRelatedViewEvents = this.presenter.getRegisterRelatedViewEvents(new NewRegisterViewLiveData.RegisterViewBinding(
                 RxTextView.textChanges(referralCodeEdTxt).skipInitialValue(),

app/src/main/java/com/swifttech/remit/jmecustomer/utils/Constants.java

@@ -59,4 +59,6 @@ public class Constants {
     public static String CANCEL="Cancel";
     public static String PAID="Paid";
 
+    public static String PASSWORD_PATTERN="^(?=.*[A-Z])(?=.*[@#$%^_&+=])(?=.*[0-9]).{8,24}$";
+
 }

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

@@ -1024,7 +1024,7 @@ All the configurations are done from backend web application system which allows
     <string name="send_money_success_body_text">Please make payment of</string>
     <string name="send_money_success_footer_text">to JME within next working day to transmit this request.\nAfter payment please check notices to get JME Number for this transfer.</string>
     <string name="request_summary_text">REQUEST SUMMARY</string>
-    <string name="password_error_text">Password should contain atleast one number,one uppercase letter and minimum 8 Characters</string>
+    <string name="password_error_text">Password should contain at least one number, one uppercase, one special character letter and minimum 8 Characters</string>
     <string name="title_activity_user_consent">Send Money</string>
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>