Add snackbar error message when .gpg-id contains a short hex id (#2819)
This commit is contained in:
parent
ab87e9c4ac
commit
97bc1e0ce5
2 changed files with 4 additions and 1 deletions
|
@ -170,7 +170,9 @@ open class BasePGPActivity : AppCompatActivity() {
|
||||||
if (line.isEmpty()) return@run
|
if (line.isEmpty()) return@run
|
||||||
// Apparently `gpg-id` being the first line is also acceptable?
|
// Apparently `gpg-id` being the first line is also acceptable?
|
||||||
if (line == "gpg-id") return@run
|
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))
|
snackbar(message = resources.getString(R.string.invalid_gpg_id))
|
||||||
}
|
}
|
||||||
return null
|
return null
|
||||||
|
|
|
@ -305,6 +305,7 @@
|
||||||
<string name="otp_import_failure_no_selection">No image file was selected</string>
|
<string name="otp_import_failure_no_selection">No image file was selected</string>
|
||||||
<string name="exporting_passwords">Exporting passwords…</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="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="invalid_filename_text">File name must not contain \'/\', set directory above</string>
|
||||||
<string name="directory_hint">Directory</string>
|
<string name="directory_hint">Directory</string>
|
||||||
<string name="new_folder_set_gpg_key">Set GPG key for directory</string>
|
<string name="new_folder_set_gpg_key">Set GPG key for directory</string>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue