Simplified implementation of password dialog.

This commit is contained in:
Juha Heinanen
2020-07-02 11:02:36 +03:00
parent 5c22ff4e73
commit 840d2d1af4
@@ -108,21 +108,23 @@ class AccountsActivity : AppCompatActivity() {
else else
input.transformationMethod = PasswordTransformationMethod() input.transformationMethod = PasswordTransformationMethod()
} }
builder.setView(layout) with (builder) {
builder.setPositiveButton(android.R.string.ok) { dialog, _ -> setView(layout)
dialog.dismiss() setPositiveButton(android.R.string.ok) { dialog, _ ->
var password = input.text.toString().trim() dialog.dismiss()
if (!Account.checkAuthPass(password)) { var password = input.text.toString().trim()
Utils.alertView(this, getString(R.string.notice), if (!Account.checkAuthPass(password)) {
String.format(getString(R.string.invalid_authentication_password), password)) Utils.alertView(this@AccountsActivity, getString(R.string.notice),
password = "" String.format(getString(R.string.invalid_authentication_password), password))
password = ""
}
setAuthPass(ua, password)
} }
setAuthPass(ua, password) setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.cancel()
}
show()
} }
builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.cancel()
}
builder.show()
} }
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {