diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2022-03-13 18:37:29 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-13 13:07:29 +0000 |
| commit | 6fc1fafe991d8c2a21340e41293fe130c88d48fa (patch) | |
| tree | fe1f92948cd6de5baebd3dbcd48dcd45be8498b8 /app/src/main/java/dev/msfjarvis/aps/ui/pgp | |
| parent | 7868c6d08e5139b4b5e44b1d458730a2f628e5d5 (diff) | |
| download | HardenedPass-6fc1fafe991d8c2a21340e41293fe130c88d48fa.tar.gz HardenedPass-6fc1fafe991d8c2a21340e41293fe130c88d48fa.zip | |
Misc PGP v2 fixes (#1784)
* Don't throw in PGPKeyImportActivity when no file is selected
* PGPSettings: mark import option as dependent on V2 backend pref
Diffstat (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/pgp')
| -rw-r--r-- | app/src/main/java/dev/msfjarvis/aps/ui/pgp/PGPKeyImportActivity.kt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/pgp/PGPKeyImportActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/pgp/PGPKeyImportActivity.kt index b97de5e0..02ea4fc3 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/pgp/PGPKeyImportActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/pgp/PGPKeyImportActivity.kt @@ -29,7 +29,7 @@ class PGPKeyImportActivity : AppCompatActivity() { registerForActivityResult(OpenDocument()) { uri -> runCatching { if (uri == null) { - throw IllegalStateException("Selected URI was null") + return@runCatching null } val keyInputStream = contentResolver.openInputStream(uri) @@ -41,13 +41,14 @@ class PGPKeyImportActivity : AppCompatActivity() { } .mapBoth( { key -> - require(key != null) { "Key cannot be null here" } - MaterialAlertDialogBuilder(this) - .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() } - .show() + if (key != null) { + MaterialAlertDialogBuilder(this) + .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() } + .show() + } }, { throwable -> MaterialAlertDialogBuilder(this) |