|
@ -16,9 +16,7 @@ public class ChangePasswordV2Presenter extends BasePresenter implements ChangePa |
|
|
|
|
|
|
|
|
private final ChangePasswordV2PresenterInterface.ChangePasswordV2ContractInterface view; |
|
|
private final ChangePasswordV2PresenterInterface.ChangePasswordV2ContractInterface view; |
|
|
private final ChangePasswordV2Gateway gateway; |
|
|
private final ChangePasswordV2Gateway gateway; |
|
|
private String currentPassword; |
|
|
|
|
|
private String newPassword; |
|
|
|
|
|
private String confirmPassword; |
|
|
|
|
|
|
|
|
|
|
|
private String encCurrentPassword; |
|
|
private String encCurrentPassword; |
|
|
private String encNewPassword; |
|
|
private String encNewPassword; |
|
|
private String encConfirmPassword; |
|
|
private String encConfirmPassword; |
|
@ -26,9 +24,7 @@ public class ChangePasswordV2Presenter extends BasePresenter implements ChangePa |
|
|
public ChangePasswordV2Presenter(ChangePasswordV2PresenterInterface.ChangePasswordV2ContractInterface view) { |
|
|
public ChangePasswordV2Presenter(ChangePasswordV2PresenterInterface.ChangePasswordV2ContractInterface view) { |
|
|
this.view=view; |
|
|
this.view=view; |
|
|
this.gateway=new ChangePasswordV2Gateway(this); |
|
|
this.gateway=new ChangePasswordV2Gateway(this); |
|
|
this.currentPassword=""; |
|
|
|
|
|
this.newPassword=""; |
|
|
|
|
|
this.confirmPassword=""; |
|
|
|
|
|
|
|
|
|
|
|
this.encCurrentPassword=""; |
|
|
this.encCurrentPassword=""; |
|
|
this.encNewPassword=""; |
|
|
this.encNewPassword=""; |
|
|
this.encConfirmPassword=""; |
|
|
this.encConfirmPassword=""; |
|
@ -105,45 +101,24 @@ public class ChangePasswordV2Presenter extends BasePresenter implements ChangePa |
|
|
boolean confirmPwdValidation=true; |
|
|
boolean confirmPwdValidation=true; |
|
|
boolean newPwdValidation=true; |
|
|
boolean newPwdValidation=true; |
|
|
|
|
|
|
|
|
if(currentPassword.trim().length()<1) |
|
|
|
|
|
|
|
|
if(encCurrentPassword==null||encCurrentPassword.trim().length()<1) |
|
|
{ |
|
|
{ |
|
|
this.view.setCurrentPasswordError(getStringfromStringId(R.string.password_empty_error)); |
|
|
this.view.setCurrentPasswordError(getStringfromStringId(R.string.password_empty_error)); |
|
|
currentPwdValidation= false; |
|
|
currentPwdValidation= false; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (!Utils.hasSpecialCharacters(newPassword)) { |
|
|
|
|
|
this.view.setNewPasswordError(getStringfromStringId(R.string.password_symbol_required_error)); |
|
|
|
|
|
newPwdValidation= false; |
|
|
|
|
|
} |
|
|
|
|
|
if (!Utils.hasNumbers(newPassword)) { |
|
|
|
|
|
this.view.setNewPasswordError(getStringfromStringId(R.string.password_number_required_error)); |
|
|
|
|
|
newPwdValidation= false; |
|
|
|
|
|
} |
|
|
|
|
|
if (newPassword.length()>1&&newPassword.length()<9) { |
|
|
|
|
|
this.view.setNewPasswordError(getStringfromStringId(R.string.password_length_error)); |
|
|
|
|
|
newPwdValidation= false; |
|
|
|
|
|
} |
|
|
|
|
|
if (!Utils.hasAtleastOnCapitalLetter(newPassword)) { |
|
|
|
|
|
this.view.setNewPasswordError(getStringfromStringId(R.string.password_capital_letter_required_error)); |
|
|
|
|
|
newPwdValidation= false; |
|
|
|
|
|
} |
|
|
|
|
|
if(newPassword.trim().length()<1) |
|
|
|
|
|
|
|
|
if(encNewPassword==null||encNewPassword.trim().length()<1) |
|
|
{ |
|
|
{ |
|
|
this.view.setNewPasswordError(getStringfromStringId(R.string.password_empty_error)); |
|
|
this.view.setNewPasswordError(getStringfromStringId(R.string.password_empty_error)); |
|
|
newPwdValidation= false; |
|
|
newPwdValidation= false; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (!newPassword.equals(confirmPassword)) { |
|
|
|
|
|
this.view.setConfirmPasswordError(getStringfromStringId(R.string.confirm_password_mismatch_error)); |
|
|
|
|
|
confirmPwdValidation= false; |
|
|
|
|
|
} |
|
|
|
|
|
if(confirmPassword==null||confirmPassword.trim().length()<1) |
|
|
|
|
|
|
|
|
if(encConfirmPassword==null||encConfirmPassword.trim().length()<1) |
|
|
{ |
|
|
{ |
|
|
this.view.setConfirmPasswordError(getStringfromStringId(R.string.confirm_passowrd_empty_error)); |
|
|
this.view.setConfirmPasswordError(getStringfromStringId(R.string.confirm_passowrd_empty_error)); |
|
|
confirmPwdValidation= false; |
|
|
confirmPwdValidation= false; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(currentPwdValidation) { |
|
|
if(currentPwdValidation) { |
|
|
view.setCurrentPasswordError(null); |
|
|
view.setCurrentPasswordError(null); |
|
|
} |
|
|
} |
|
@ -156,7 +131,6 @@ public class ChangePasswordV2Presenter extends BasePresenter implements ChangePa |
|
|
if(newPwdValidation) |
|
|
if(newPwdValidation) |
|
|
{ |
|
|
{ |
|
|
view.setNewPasswordError(null); |
|
|
view.setNewPasswordError(null); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return currentPwdValidation&&confirmPwdValidation&&newPwdValidation; |
|
|
return currentPwdValidation&&confirmPwdValidation&&newPwdValidation; |
|
@ -165,30 +139,27 @@ public class ChangePasswordV2Presenter extends BasePresenter implements ChangePa |
|
|
@Override |
|
|
@Override |
|
|
public void changePassword(String currentPass, String newPass) { |
|
|
public void changePassword(String currentPass, String newPass) { |
|
|
|
|
|
|
|
|
this.gateway.performChangePassRequest(this.gateway.getAuth(),this.gateway.getUserID(),this.currentPassword,this.newPassword) |
|
|
|
|
|
.doOnSubscribe(d->view.showProgressBar(true,getStringfromStringId(R.string.processing_request_text))) |
|
|
|
|
|
.doFinally(()->view.showProgressBar(false,"")) |
|
|
|
|
|
.subscribeOn(Schedulers.io()) |
|
|
|
|
|
.observeOn(AndroidSchedulers.mainThread()) |
|
|
|
|
|
.subscribe(new ChangePasswordObserver()); |
|
|
|
|
|
|
|
|
this.gateway.performChangePassRequest(this.gateway.getAuth(),this.gateway.getUserID(),this.encCurrentPassword,this.encNewPassword,this.encConfirmPassword) |
|
|
|
|
|
.doOnSubscribe(d->view.showProgressBar(true,"Changing password...")) |
|
|
|
|
|
.doFinally(()->view.showProgressBar(false,"")) |
|
|
|
|
|
.subscribeOn(Schedulers.io()) |
|
|
|
|
|
.observeOn(AndroidSchedulers.mainThread()) |
|
|
|
|
|
.subscribe(new ChangePasswordObserver()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void updateCurrentPassword(String encCurrentPassword, String currentPassword) { |
|
|
|
|
|
|
|
|
public void updateCurrentPassword(String encCurrentPassword) { |
|
|
this.encCurrentPassword=encCurrentPassword; |
|
|
this.encCurrentPassword=encCurrentPassword; |
|
|
this.currentPassword=currentPassword; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void updateNewPassword(String encNewPassword,String newPassword) { |
|
|
|
|
|
|
|
|
public void updateNewPassword(String encNewPassword) { |
|
|
this.encNewPassword=encNewPassword; |
|
|
this.encNewPassword=encNewPassword; |
|
|
this.newPassword=newPassword; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void updateConfirmPassword(String encConfirmPassword, String confirmPassword) { |
|
|
|
|
|
|
|
|
public void updateConfirmPassword(String encConfirmPassword) { |
|
|
this.encConfirmPassword=encConfirmPassword; |
|
|
this.encConfirmPassword=encConfirmPassword; |
|
|
this.confirmPassword=confirmPassword; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|