Fix openMF#688: Login fails after entering correct passcode for the f…

…ourth time after 3 wrong tries.
AkshGautam · Mar 19, 2018 · 697b1e4 · 697b1e4
1 parent a6d7ff4
commit 697b1e4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/src/main/java/org/mifos/mobilebanking/ui/activities/PassCodeActivity.java b/app/src/main/java/org/mifos/mobilebanking/ui/activities/PassCodeActivity.java
@@ -146,8 +146,9 @@ public void passCodeEntered(String passcode) {
             passCodeView.clearPasscodeField();
             return;
         }
-
-        if (counter == 3) {
+        String passwordEntered = EncryptionUtil.getHash(passCodeView.getPasscode());
+        boolean isPassCodeCorrect = preferencesHelper.getPasscode().equals(passwordEntered);
+        if (counter == 3 && !isPassCodeCorrect) {
             Toast.makeText(getApplicationContext(), R.string.incorrect_passcode_more_than_three,
                     Toast.LENGTH_SHORT).show();
             preferencesHelper.clear();
@@ -156,8 +157,7 @@ public void passCodeEntered(String passcode) {
         }
 
         if (isPassCodeLengthCorrect()) {
-            String passwordEntered = EncryptionUtil.getHash(passCodeView.getPasscode());
-            if (preferencesHelper.getPasscode().equals(passwordEntered)) {
+            if (isPassCodeCorrect) {
                 BaseApiManager.createService(preferencesHelper.getBaseUrl(),
                         preferencesHelper.getTenant(), preferencesHelper.getToken());
                 startHomeActivity();