|
@ -64,7 +64,7 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private Observable<String> encryptByKeyStore(String data) { |
|
|
private Observable<String> encryptByKeyStore(String data) { |
|
|
return SecurityUtils.encryptToKeyStore(view.getContext(), data) |
|
|
|
|
|
|
|
|
return SecurityUtils.encryptByKeyStore(view.getContext(), data) |
|
|
.flatMap(encKey -> Observable.just(encKey.getEncrypted())); |
|
|
.flatMap(encKey -> Observable.just(encKey.getEncrypted())); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -79,7 +79,7 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private Observable<String> decryptByKeyStore(String data) { |
|
|
private Observable<String> decryptByKeyStore(String data) { |
|
|
return SecurityUtils.decryptFromKeyStore(view.getContext(), data) |
|
|
|
|
|
|
|
|
return SecurityUtils.decryptByKeyStore(view.getContext(), data) |
|
|
.flatMap(authentication -> { |
|
|
.flatMap(authentication -> { |
|
|
switch (authentication.getResult()) { |
|
|
switch (authentication.getResult()) { |
|
|
case FAILED: |
|
|
case FAILED: |
|
@ -193,9 +193,7 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI |
|
|
if (SecurityUtils.checkFingerPrintUsablity(view.getContext())) |
|
|
if (SecurityUtils.checkFingerPrintUsablity(view.getContext())) |
|
|
persistUserCredentialForFingerprintAuth(userId, encUserPassword,loginResponse); |
|
|
persistUserCredentialForFingerprintAuth(userId, encUserPassword,loginResponse); |
|
|
else { |
|
|
else { |
|
|
view.showInvalidPassword(null); |
|
|
|
|
|
view.showInvalidUserId(null); |
|
|
|
|
|
encUserPassword = null; |
|
|
|
|
|
|
|
|
|
|
|
onLoginSuccess(loginResponse); |
|
|
onLoginSuccess(loginResponse); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -219,8 +217,17 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void clearExistingFormData() |
|
|
|
|
|
{ |
|
|
|
|
|
view.showInvalidPassword(null); |
|
|
|
|
|
view.showInvalidUserId(null); |
|
|
|
|
|
view.clearUserName(); |
|
|
|
|
|
view.clearPassword(); |
|
|
|
|
|
encUserPassword = null; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
private void onLoginSuccess(LoginModelV2 loginResponse) { |
|
|
private void onLoginSuccess(LoginModelV2 loginResponse) { |
|
|
|
|
|
clearExistingFormData(); |
|
|
Runnable task=null; |
|
|
Runnable task=null; |
|
|
boolean hasSubmittedKYC=loginResponse.getKyc(); |
|
|
boolean hasSubmittedKYC=loginResponse.getKyc(); |
|
|
boolean hasCompletedPennyTest=loginResponse.getPennyTestStatus().equalsIgnoreCase("2"); |
|
|
boolean hasCompletedPennyTest=loginResponse.getPennyTestStatus().equalsIgnoreCase("2"); |
|
@ -316,9 +323,6 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI |
|
|
gateway.persistSecretKey(fingerprintEncResult.getEncKey()); |
|
|
gateway.persistSecretKey(fingerprintEncResult.getEncKey()); |
|
|
gateway.persistUserPwd(fingerprintEncResult.getEncPwd()); |
|
|
gateway.persistUserPwd(fingerprintEncResult.getEncPwd()); |
|
|
gateway.persistUserId(fingerprintEncResult.getUserId()); |
|
|
gateway.persistUserId(fingerprintEncResult.getUserId()); |
|
|
view.showInvalidPassword(null); |
|
|
|
|
|
view.showInvalidUserId(null); |
|
|
|
|
|
encUserPassword = null; |
|
|
|
|
|
onLoginSuccess(loginModelV2); |
|
|
onLoginSuccess(loginModelV2); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|