|
|
@ -139,6 +139,7 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI |
|
|
|
.setListener(new GMEAuthManager.GMEAuthListener() { |
|
|
|
@Override |
|
|
|
public void onGMEAuthSuccess(GMEAuthSuccessResult result) { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
@ -180,11 +181,11 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI |
|
|
|
private boolean validateUserId(CharSequence userID) { |
|
|
|
|
|
|
|
if (userID == null || userID.length() < 1) { |
|
|
|
loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO(false, getStringfromStringId(R.string.user_id_empty_error))); |
|
|
|
loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.user_id_empty_error))); |
|
|
|
this.userId = null; |
|
|
|
return false; |
|
|
|
} else { |
|
|
|
loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO(true, "")); |
|
|
|
loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO<>(true, "")); |
|
|
|
this.userId = userID.toString(); |
|
|
|
return true; |
|
|
|
} |
|
|
@ -193,11 +194,11 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI |
|
|
|
private boolean validatePassword(CharSequence password) { |
|
|
|
|
|
|
|
if (password == null || password.length() < 1) { |
|
|
|
loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO(false, getStringfromStringId(R.string.password_empty_error))); |
|
|
|
loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.password_empty_error))); |
|
|
|
this.password = null; |
|
|
|
return false; |
|
|
|
} else { |
|
|
|
loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO(true, "")); |
|
|
|
loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(true, "")); |
|
|
|
this.password = password.toString(); |
|
|
|
return true; |
|
|
|
} |
|
|
@ -209,13 +210,14 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI |
|
|
|
|
|
|
|
public class LoginObserver extends GenericApiObserverResponse<LoginModelV2> { |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
protected void onSuccess(LoginModelV2 loginResponse) { |
|
|
|
if (gmeAuthManager.isBiometricSupportedByDevice()) |
|
|
|
gmeAuthManager.persistUserCredentialForFingerprintAuth(loginValidator.userId, loginValidator.password) |
|
|
|
.doOnSubscribe(sub->view.showProgressBar(true,"")) |
|
|
|
.subscribeOn(Schedulers.io()) |
|
|
|
.observeOn(AndroidSchedulers.mainThread()) |
|
|
|
.doFinally(()->view.showProgressBar(false,"")) |
|
|
|
.subscribe(new CompletableObserver() { |
|
|
|
@Override |
|
|
|
public void onSubscribe(Disposable d) { |
|
|
@ -254,15 +256,9 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private void clearExistingFormData() { |
|
|
|
view.showInvalidPassword(null); |
|
|
|
view.showInvalidUserId(null); |
|
|
|
view.clearUserName(); |
|
|
|
view.clearPassword(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void onLoginSuccess() { |
|
|
|
clearExistingFormData(); |
|
|
|
setSessionEnabled(); |
|
|
|
view.redirectToDashboard(); |
|
|
|
|
|
|
|