From dfdaa4cc5719b2f9576e0d803bbdf846c3445ce3 Mon Sep 17 00:00:00 2001 From: Hafiz Date: Sun, 15 May 2022 16:01:03 -0400 Subject: [PATCH] Confirmation deletion updated --- .../fragments/preferences/HabiticaAccountDialog.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt index 3c0b4a276..3e6d31ece 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt @@ -93,7 +93,7 @@ class HabiticaAccountDialog(private var thisContext: Context, private val accoun } override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { - if (confirmationText?.text.toString().length >= 5) { + if (confirmationText?.text.toString().length > 5) { if ((user?.authentication?.hasPassword != true && confirmationText?.text.toString() == context?.getString(R.string.delete_caps)) || user?.authentication?.hasPassword == true) { confirmationAction?.setTextColor(ContextCompat.getColor(thisContext, R.color.red_100)) @@ -109,9 +109,16 @@ class HabiticaAccountDialog(private var thisContext: Context, private val accoun } }) confirmationAction?.setOnClickListener { - if (confirmationText?.text.toString() == context?.getString(R.string.delete_caps)) { - accountUpdateConfirmed.deletionConfirmClicked(confirmationText?.text.toString()) + if (user?.authentication?.hasPassword != true) { + if (confirmationText?.text.toString() == context?.getString(R.string.delete_caps)) { + accountUpdateConfirmed.deletionConfirmClicked(confirmationText?.text.toString()) + } + } else { + if (confirmationText?.text.toString().length > 5) { + accountUpdateConfirmed.deletionConfirmClicked(confirmationText?.text.toString()) + } } + } }