mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-30 13:57:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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