mirror of
https://github.com/element-hq/element-android
synced 2024-10-26 20:57:20 +03:00
Change password: prevent cancellation when processing
This commit is contained in:
parent
bf5e2b96df
commit
757f8ec96a
1 changed files with 4 additions and 0 deletions
|
@ -702,6 +702,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
|
||||||
|
|
||||||
val dialog = AlertDialog.Builder(activity)
|
val dialog = AlertDialog.Builder(activity)
|
||||||
.setView(view)
|
.setView(view)
|
||||||
|
.setCancelable(false)
|
||||||
.setPositiveButton(R.string.settings_change_password, null)
|
.setPositiveButton(R.string.settings_change_password, null)
|
||||||
.setNegativeButton(R.string.cancel, null)
|
.setNegativeButton(R.string.cancel, null)
|
||||||
.setOnDismissListener {
|
.setOnDismissListener {
|
||||||
|
@ -711,6 +712,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
|
||||||
|
|
||||||
dialog.setOnShowListener {
|
dialog.setOnShowListener {
|
||||||
val updateButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE)
|
val updateButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE)
|
||||||
|
val cancelButton = dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
|
||||||
updateButton.isEnabled = false
|
updateButton.isEnabled = false
|
||||||
|
|
||||||
fun updateUi() {
|
fun updateUi() {
|
||||||
|
@ -754,6 +756,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
|
||||||
confirmNewPasswordText.isEnabled = false
|
confirmNewPasswordText.isEnabled = false
|
||||||
changePasswordLoader.isVisible = true
|
changePasswordLoader.isVisible = true
|
||||||
updateButton.isEnabled = false
|
updateButton.isEnabled = false
|
||||||
|
cancelButton.isEnabled = false
|
||||||
} else {
|
} else {
|
||||||
showPassword.isEnabled = true
|
showPassword.isEnabled = true
|
||||||
oldPasswordText.isEnabled = true
|
oldPasswordText.isEnabled = true
|
||||||
|
@ -761,6 +764,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
|
||||||
confirmNewPasswordText.isEnabled = true
|
confirmNewPasswordText.isEnabled = true
|
||||||
changePasswordLoader.isVisible = false
|
changePasswordLoader.isVisible = false
|
||||||
updateButton.isEnabled = true
|
updateButton.isEnabled = true
|
||||||
|
cancelButton.isEnabled = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue