diff --git a/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift b/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift index c285d97b..d99b028b 100644 --- a/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift +++ b/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift @@ -284,8 +284,13 @@ extension LoginViewController: TransKeyViewDelegate { if isShowQwerty == true { qwertyCipherString = mQwertyTransKeyView?.mTK_GetSecureData() targetView = mQwertyTransKeyView - self.encryptedPassword = qwertyCipherString - self.passwordTextField.text = "password" + if mQwertyTransKeyView?.mTK_GetDataLength() == 0 { + self.encryptedPassword = "" + self.passwordTextField.text = "" + }else { + self.encryptedPassword = qwertyCipherString + self.passwordTextField.text = "password" + } } isShowQwerty = false @@ -311,6 +316,8 @@ extension LoginViewController: TransKeyViewDelegate { mQwertyTransKeyView?.mTK_setHideInputPasswordDelay(3) mQwertyTransKeyView?.mTK_SetControlCenter(false) mQwertyTransKeyView?.mTK_setIgnoreStatusbar(false) + + // mQwertyTransKeyView?.mTK_SetLanguage(1) mQwertyTransKeyView?.mTK_Supported(byDeviceOrientation: SupportedByDevicePortraitAndLandscape) diff --git a/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift b/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift index 9c84c035..eadf171b 100644 --- a/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift +++ b/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift @@ -225,13 +225,25 @@ extension RegisterViewController: TransKeyViewDelegate { qwertyCipherString = mQwertyTransKeyView?.mTK_GetSecureData() if showingPasswordField { - self.encryptedPassword = qwertyCipherString - self.passwordTextField.text = "password" - } + if mQwertyTransKeyView?.mTK_GetDataLength() == 0 { + self.encryptedPassword = "" + self.passwordTextField.text = "" + }else { + self.encryptedPassword = qwertyCipherString + self.passwordTextField.text = "password" + } } if showingConfirmPasswordField { - encryptedConfirmPassword = qwertyCipherString - self.confirmPasswordTextfield.text = "password" + if mQwertyTransKeyView?.mTK_GetDataLength() == 0 { + + encryptedConfirmPassword = "" + self.confirmPasswordTextfield.text = "" + }else { + + encryptedConfirmPassword = qwertyCipherString + self.confirmPasswordTextfield.text = "password" + } + } targetView = mQwertyTransKeyView diff --git a/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift b/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift index 825c415b..d17c9a06 100644 --- a/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift +++ b/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift @@ -352,6 +352,11 @@ extension SendMoneyVerificationViewController: TransKeyViewDelegate { if isShowQwerty == true{ qwertyCipherString = mQwertyTransKeyView?.mTK_GetSecureData() + if mQwertyTransKeyView?.mTK_GetDataLength() == 0 { + self.encryptedText = "" + }else { + self.encryptedText = qwertyCipherString + } self.encryptedText = qwertyCipherString targetView = mQwertyTransKeyView diff --git a/GMERemittance/Profile/ProfileChangePasswordViewController.swift b/GMERemittance/Profile/ProfileChangePasswordViewController.swift index ccac8419..5c08a638 100644 --- a/GMERemittance/Profile/ProfileChangePasswordViewController.swift +++ b/GMERemittance/Profile/ProfileChangePasswordViewController.swift @@ -307,19 +307,39 @@ extension ProfileChangePasswordViewController: TransKeyViewDelegate { qwertyCipherString = mQwertyTransKeyView?.mTK_GetSecureData() if showingPasswordField { - self.encryptedPassword = qwertyCipherString - self.password = "password" + + if mQwertyTransKeyView?.mTK_GetDataLength() == 0 { + self.encryptedPassword = "" + self.password = "" + }else { + self.encryptedPassword = qwertyCipherString + self.password = "password" + } + } if showingConfirmPasswordField { - confirmPassword = "password" - self.encryptedConfirmPassword = qwertyCipherString + if mQwertyTransKeyView?.mTK_GetDataLength() == 0 { + confirmPassword = "" + self.encryptedConfirmPassword = "" + }else { + confirmPassword = "password" + self.encryptedConfirmPassword = qwertyCipherString + } + } if showingOldPasswordField { - oldPassword = "password" - encryptedOldPassword = qwertyCipherString + + if mQwertyTransKeyView?.mTK_GetDataLength() == 0 { + oldPassword = "" + encryptedOldPassword = "" + }else { + oldPassword = "password" + encryptedOldPassword = qwertyCipherString + } + } targetView = mQwertyTransKeyView }