Translation added for error in login and register

app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java

@@ -1,6 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.loginV2.presenter;
 
 import com.gmeremit.online.gmeremittance_native.GmeApplication;
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.loginV2.gateway.LoginV2Gateway;
@@ -31,7 +32,7 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI
     @Override
     public boolean validateUserId(String userId) {
         if(userId.length()<1) {
-            view.showInvalidUserId("User id cannot be empty.");
+            view.showInvalidUserId(getStringfromStringId(R.string.user_id_empty_error));
             return false;
         }
         else {
@@ -42,7 +43,7 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI
 
     private boolean validatePassword() {
         if(encUserPassword.length()<1) {
-            view.showInvalidPassword("Password cannot be empty.");
+            view.showInvalidPassword(getStringfromStringId(R.string.password_empty_error));
             return false;
         }
         else {

app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java

@@ -370,21 +370,10 @@ public class LoginV2Activity extends BaseActivity implements View.OnClickListene
         @Override
         public void cancel(Intent intent) {
             String encryptedText = intent.getStringExtra(TransKeyActivity.mTK_PARAM_SECURE_DATA);
-            presenter.updateUserPassword(encryptedText);        }
-
-
-        private String getDecryptedDataFromIntent(Intent intent)
-        {
-            if (intent == null)
-                return "";
+            presenter.updateUserPassword(encryptedText);
+        }
 
-            String cipherData = intent.getStringExtra(TransKeyActivity.mTK_PARAM_CIPHER_DATA);
 
-            byte[] secureKey = intent.getByteArrayExtra(TransKeyActivity.mTK_PARAM_SECURE_KEY);
-            int iRealDataLength = intent.getIntExtra(TransKeyActivity.mTK_PARAM_DATA_LENGTH, 0);
-            Log.d("EncryptedData",cipherData);
-            return EncryptionManager.decryptCipherText(cipherData,secureKey,iRealDataLength);
-        }
 
 
         @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java

@@ -98,13 +98,13 @@ public class RegisterV2Presenter extends BasePresenter implements RegisterV2Pres
 
         if(encPassword==null||encPassword.trim().length()<1)
         {
-            this.view.setPasswordError("Password cannot be empty");
+            this.view.setPasswordError(getStringfromStringId(R.string.password_empty_error));
             pwdValidation= false;
         }
 
         if(encConfirmPassword==null||encConfirmPassword.trim().length()<1)
         {
-            this.view.setConfirmPasswordError("Confirm password cannot be empty");
+            this.view.setConfirmPasswordError(getStringfromStringId(R.string.confirm_passowrd_empty_error));
             confirmPwdValidation= false;
         }
         if(pwdValidation) {
@@ -158,7 +158,7 @@ public class RegisterV2Presenter extends BasePresenter implements RegisterV2Pres
     public boolean validateDob(String dobString) {
         if(dobString==null||dobString.trim().length()<1)
         {
-            view.setDobError("Please enter a valid date of birth");
+            this.view.setDobError(getStringfromStringId(R.string.dob_valid_error));
             return false;
         }
         view.setDobError(null);
@@ -169,7 +169,7 @@ public class RegisterV2Presenter extends BasePresenter implements RegisterV2Pres
     public boolean validateEmail(String emailId) {
         if(!Utils.isValidEmail(emailId))
         {
-            this.view.setUserIdError("Please enter a valid email id");
+            this.view.setUserIdError(getStringfromStringId(R.string.email_valid_error));
             return false;
         }
         this.view.setUserIdError(null);

app/src/main/java/com/gmeremit/online/gmeremittance_native/resetpassV2/presenter/ResetPassV2Presenter.java

@@ -55,7 +55,7 @@ public class ResetPassV2Presenter extends BasePresenter implements ResetPassV2Pr
     private boolean validateEmail(String emailId) {
         if(!Utils.isValidEmail(emailId))
         {
-            this.view.showIncorrectEmail("Please enter a valid email id");
+            this.view.showIncorrectEmail(getStringfromStringId(R.string.email_valid_error));
             return false;
         }
         this.view.showIncorrectEmail(null);
@@ -65,7 +65,7 @@ public class ResetPassV2Presenter extends BasePresenter implements ResetPassV2Pr
     private boolean validateDob(String dobString) {
         if(dobString==null||dobString.trim().length()<1)
         {
-            view.showIncorrectDob("Please enter a valid dob");
+            view.showIncorrectDob(getStringfromStringId(R.string.dob_valid_error));
             return false;
         }
         view.showIncorrectDob(null);

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

@@ -333,6 +333,9 @@
     <string name="error_text">Error</string>
     <string name="operation_failed_text">Operation Failed</string>
     <string name="connection_failed_text">Connection Failed</string>
+    <string name="email_valid_error">Please enter a valid email id</string>
+    <string name="dob_valid_error">Please enter a valid date of birth</string>
+    <string name="user_id_empty_error">User id cannot be empty</string>
 
 
 </resources>