diff options
| author | Mathias Rav <m@git.strova.dk> | 2023-12-16 17:11:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-16 21:41:26 +0530 |
| commit | 97bc1e0ce52fc8411b252ae912bac40d29feee64 (patch) | |
| tree | 372328d9a5682aedf38dd3992abd46585f86bc0f /app | |
| parent | ab87e9c4ac5a97fee24f74ebfd4e727e63001da9 (diff) | |
Add snackbar error message when .gpg-id contains a short hex id (#2819)
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/crypto/BasePGPActivity.kt | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/src/main/java/app/passwordstore/ui/crypto/BasePGPActivity.kt b/app/src/main/java/app/passwordstore/ui/crypto/BasePGPActivity.kt index d0039d52..7fa56333 100644 --- a/app/src/main/java/app/passwordstore/ui/crypto/BasePGPActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/crypto/BasePGPActivity.kt @@ -170,7 +170,9 @@ open class BasePGPActivity : AppCompatActivity() { if (line.isEmpty()) return@run // Apparently `gpg-id` being the first line is also acceptable? if (line == "gpg-id") return@run - if (line.removePrefix("0x").matches("[a-fA-F0-9]{8}".toRegex()).not()) { + if (line.removePrefix("0x").matches("[a-fA-F0-9]{8}".toRegex())) { + snackbar(message = resources.getString(R.string.short_gpg_id)) + } else { snackbar(message = resources.getString(R.string.invalid_gpg_id)) } return null diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 21ad8845..acb07b5e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -305,6 +305,7 @@ <string name="otp_import_failure_no_selection">No image file was selected</string> <string name="exporting_passwords">Exporting passwords…</string> <string name="invalid_gpg_id">Found .gpg-id, but it contains an invalid key ID, fingerprint or user ID</string> + <string name="short_gpg_id">Found .gpg-id, but it contains a short hex ID, which is not supported</string> <string name="invalid_filename_text">File name must not contain \'/\', set directory above</string> <string name="directory_hint">Directory</string> <string name="new_folder_set_gpg_key">Set GPG key for directory</string> |