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

Misc PGP v2 fixes (#1784)

Browse source 
* Don't throw in PGPKeyImportActivity when no file is selected

* PGPSettings: mark import option as dependent on V2 backend pref
This commit is contained in:
Harsh Shandilya 2022-03-13 18:37:29 +05:30 committed by GitHub
parent 7868c6d08e
commit 6fc1fafe99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/dev/msfjarvis/aps/ui/pgp/PGPKeyImportActivity.kt
View file

@ -29,7 +29,7 @@ class PGPKeyImportActivity : AppCompatActivity() {
registerForActivityResult(OpenDocument()) { uri -> registerForActivityResult(OpenDocument()) { uri ->
runCatching { runCatching {
if (uri == null) { if (uri == null) {
throw IllegalStateException("Selected URI was null") return@runCatching null
} }
val keyInputStream = val keyInputStream =
contentResolver.openInputStream(uri) contentResolver.openInputStream(uri)
@ -41,13 +41,14 @@ class PGPKeyImportActivity : AppCompatActivity() {
} }
.mapBoth( .mapBoth(
{ key -> { key ->
require(key != null) { "Key cannot be null here" } if (key != null) {
MaterialAlertDialogBuilder(this) MaterialAlertDialogBuilder(this)
.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() } .setOnCancelListener { finish() }
.show() .show()
}
}, },
{ throwable -> { throwable ->
MaterialAlertDialogBuilder(this) MaterialAlertDialogBuilder(this)

10
app/src/main/java/dev/msfjarvis/aps/ui/settings/PGPSettings.kt
View file

@ -18,13 +18,15 @@ class PGPSettings(private val activity: FragmentActivity) : SettingsProvider {
override fun provideSettings(builder: PreferenceScreen.Builder) { override fun provideSettings(builder: PreferenceScreen.Builder) {
builder.apply { builder.apply {
checkBox(Feature.EnablePGPainlessBackend.configKey) { val enablePGPainless =
title = "Enable new PGP backend" checkBox(Feature.EnablePGPainlessBackend.configKey) {
persistent = true title = "Enable new PGP backend"
} persistent = true
}
pref("_") { pref("_") {
title = "Import PGP key" title = "Import PGP key"
persistent = false persistent = false
dependency = enablePGPainless.key
onClick { onClick {
activity.launchActivity(PGPKeyImportActivity::class.java) activity.launchActivity(PGPKeyImportActivity::class.java)
false false