rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Validate OTP dialog only if no error

Browse Source
This commit is contained in:
J-Jamet
2019-11-10 12:19:06 +01:00
parent adf5382804
commit ca4ad1c1fd
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt
View File

@@ -51,6 +51,11 @@ class SetOTPDialogFragment : DialogFragment() {
private var hotpTokenTypeAdapter: ArrayAdapter<OtpTokenType>? = null private var hotpTokenTypeAdapter: ArrayAdapter<OtpTokenType>? = null
private var otpAlgorithmAdapter: ArrayAdapter<TokenCalculator.HashAlgorithm>? = null private var otpAlgorithmAdapter: ArrayAdapter<TokenCalculator.HashAlgorithm>? = null
private var mSecretWellFormed = true
private var mCounterWellFormed = true
private var mPeriodWellFormed = true
private var mDigitsWellFormed = true
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
// Retrieve OTP model from instance state // Retrieve OTP model from instance state
@@ -125,10 +130,7 @@ class SetOTPDialogFragment : DialogFragment() {
builder.apply { builder.apply {
setTitle(R.string.entry_setup_otp) setTitle(R.string.entry_setup_otp)
setView(root) setView(root)
.setPositiveButton(android.R.string.ok) { _, _ -> .setPositiveButton(android.R.string.ok) {_, _ -> }
createOTPElementListener?.invoke(mOtpElement)
// TODO prevent dismiss if error
}
.setNegativeButton(android.R.string.cancel) { _, _ -> .setNegativeButton(android.R.string.cancel) { _, _ ->
} }
} }
@@ -138,6 +140,19 @@ class SetOTPDialogFragment : DialogFragment() {
return super.onCreateDialog(savedInstanceState) return super.onCreateDialog(savedInstanceState)
} }
override fun onStart() {
super.onStart()
(dialog as AlertDialog).getButton(Dialog.BUTTON_POSITIVE).setOnClickListener {
if (mSecretWellFormed
&& mCounterWellFormed
&& mPeriodWellFormed
&& mDigitsWellFormed) {
createOTPElementListener?.invoke(mOtpElement)
dismiss()
}
}
}
private fun attachListeners() { private fun attachListeners() {
// Set Type listener // Set Type listener
otpTypeSpinner?.onItemSelectedListener = object: AdapterView.OnItemSelectedListener { otpTypeSpinner?.onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
@@ -184,6 +199,7 @@ class SetOTPDialogFragment : DialogFragment() {
} catch (exception: Exception) { } catch (exception: Exception) {
otpSecretContainer?.error = getString(R.string.error_otp_secret_key) otpSecretContainer?.error = getString(R.string.error_otp_secret_key)
} }
mSecretWellFormed = otpSecretContainer?.error == null
} }
} }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
@@ -201,6 +217,7 @@ class SetOTPDialogFragment : DialogFragment() {
otpCounterContainer?.error = getString(R.string.error_otp_counter, otpCounterContainer?.error = getString(R.string.error_otp_counter,
MIN_HOTP_COUNTER, MAX_HOTP_COUNTER) MIN_HOTP_COUNTER, MAX_HOTP_COUNTER)
} }
mCounterWellFormed = otpCounterContainer?.error == null
} }
} }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
@@ -218,6 +235,7 @@ class SetOTPDialogFragment : DialogFragment() {
otpPeriodContainer?.error = getString(R.string.error_otp_period, otpPeriodContainer?.error = getString(R.string.error_otp_period,
MIN_TOTP_PERIOD, MAX_TOTP_PERIOD) MIN_TOTP_PERIOD, MAX_TOTP_PERIOD)
} }
mPeriodWellFormed = otpPeriodContainer?.error == null
} }
} }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
@@ -235,6 +253,7 @@ class SetOTPDialogFragment : DialogFragment() {
otpDigitsContainer?.error = getString(R.string.error_otp_digits, otpDigitsContainer?.error = getString(R.string.error_otp_digits,
MIN_OTP_DIGITS, MAX_OTP_DIGITS) MIN_OTP_DIGITS, MAX_OTP_DIGITS)
} }
mDigitsWellFormed = otpDigitsContainer?.error == null
} }
} }
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}