kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mark key import dialogs as non-cancellable

Browse source
This commit is contained in:
Harsh Shandilya 2022-07-17 22:22:12 +05:30
parent 4ed98c9fda
commit e1e5d13a6a
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/app/passwordstore/ui/pgp/PGPKeyImportActivity.kt
View file

@ -82,7 +82,7 @@ class PGPKeyImportActivity : AppCompatActivity() {
.setTitle(getString(R.string.pgp_key_import_succeeded))
.setMessage(getString(R.string.pgp_key_import_succeeded_message, tryGetId(key)))
.setPositiveButton(android.R.string.ok) { _, _ -> finish() }
.setOnCancelListener { finish() }
.setCancelable(false)
.show()
}
is Err<Throwable> -> {
@ -94,14 +94,14 @@ class PGPKeyImportActivity : AppCompatActivity() {
handleImportResult(runCatching { importKey(lastBytes!!, replace = true) })
}
.setNegativeButton(R.string.dialog_no) { _, _ -> finish() }
.setOnCancelListener { finish() }
.setCancelable(false)
.show()
} else {
MaterialAlertDialogBuilder(this)
.setTitle(getString(R.string.pgp_key_import_failed))
.setMessage(result.error.message)
.setPositiveButton(android.R.string.ok) { _, _ -> finish() }
.setOnCancelListener { finish() }
.setCancelable(false)
.show()
}
}