Change Password Fixes

app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java

@@ -287,6 +287,7 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass
 
         @Override
         public void onSecurityViewRecievedFocus() {
+            hideKeyboardFromRemainingWidget();
             if (securityKeyboardCurrentPasswordManager != null && !securityKeyboardCurrentPasswordManager.isKeyboardVisible()) {
                 hideKeyBoard();
                 securityKeyboardCurrentPasswordManager.showKeyboard();
@@ -304,6 +305,17 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass
             else
                 hideKeyBoard();
         }
+
+        /**
+         *
+         */
+        private void hideKeyboardFromRemainingWidget()
+        {
+            if(securityKeyboardNewPasswordManager!=null&&securityKeyboardNewPasswordManager.isKeyboardVisible())
+                securityKeyboardNewPasswordManager.hideKeyboard();
+            if(securityKeyboardConfirmPasswordManager!=null&&securityKeyboardConfirmPasswordManager.isKeyboardVisible())
+                securityKeyboardConfirmPasswordManager.hideKeyboard();
+        }
     }
     class SecurityKeypadNewPasswordListener implements SecurityKeyboardManager.SecurityKeyboardActionListenerFacade,SecurityKeyboardView.SecurityKeyboardFocusStateListener {
         @Override
@@ -348,6 +360,7 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass
 
         @Override
         public void onSecurityViewRecievedFocus() {
+            hideKeyboardFromRemainingWidget();
             if (securityKeyboardNewPasswordManager != null && !securityKeyboardNewPasswordManager.isKeyboardVisible()) {
                 hideKeyBoard();
                 securityKeyboardNewPasswordManager.showKeyboard();
@@ -366,6 +379,14 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass
             else
                 hideKeyBoard();
         }
+
+        private void hideKeyboardFromRemainingWidget()
+        {
+            if(securityKeyboardCurrentPasswordManager!=null&&securityKeyboardCurrentPasswordManager.isKeyboardVisible())
+                securityKeyboardCurrentPasswordManager.hideKeyboard();
+            if(securityKeyboardConfirmPasswordManager!=null&&securityKeyboardConfirmPasswordManager.isKeyboardVisible())
+                securityKeyboardConfirmPasswordManager.hideKeyboard();
+        }
     }
     class SecurityKeypadConfirmPasswordListener implements SecurityKeyboardManager.SecurityKeyboardActionListenerFacade,SecurityKeyboardView.SecurityKeyboardFocusStateListener {
         @Override
@@ -410,6 +431,7 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass
 
         @Override
         public void onSecurityViewRecievedFocus() {
+            hideKeyboardFromRemainingWidget();
             if (securityKeyboardConfirmPasswordManager != null && !securityKeyboardConfirmPasswordManager.isKeyboardVisible()) {
                 hideKeyBoard();
                 securityKeyboardConfirmPasswordManager.showKeyboard();
@@ -427,5 +449,14 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass
             else
                 hideKeyBoard();
         }
+
+
+        private void hideKeyboardFromRemainingWidget()
+        {
+            if(securityKeyboardCurrentPasswordManager!=null&&securityKeyboardCurrentPasswordManager.isKeyboardVisible())
+                securityKeyboardCurrentPasswordManager.hideKeyboard();
+            if(securityKeyboardNewPasswordManager!=null&&securityKeyboardNewPasswordManager.isKeyboardVisible())
+                securityKeyboardNewPasswordManager.hideKeyboard();
+        }
     }
 }