This repository was archived by the owner on Oct 15, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +4
-1
lines changed
java/app/passwordstore/ui/crypto Expand file tree Collapse file tree 2 files changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -170,7 +170,9 @@ open class BasePGPActivity : AppCompatActivity() {
170
170
if (line.isEmpty()) return @run
171
171
// Apparently `gpg-id` being the first line is also acceptable?
172
172
if (line == " gpg-id" ) return @run
173
- if (line.removePrefix(" 0x" ).matches(" [a-fA-F0-9]{8}" .toRegex()).not ()) {
173
+ if (line.removePrefix(" 0x" ).matches(" [a-fA-F0-9]{8}" .toRegex())) {
174
+ snackbar(message = resources.getString(R .string.short_gpg_id))
175
+ } else {
174
176
snackbar(message = resources.getString(R .string.invalid_gpg_id))
175
177
}
176
178
return null
Original file line number Diff line number Diff line change 305
305
<string name =" otp_import_failure_no_selection" >No image file was selected</string >
306
306
<string name =" exporting_passwords" >Exporting passwords…</string >
307
307
<string name =" invalid_gpg_id" >Found .gpg-id, but it contains an invalid key ID, fingerprint or user ID</string >
308
+ <string name =" short_gpg_id" >Found .gpg-id, but it contains a short hex ID, which is not supported</string >
308
309
<string name =" invalid_filename_text" >File name must not contain \'/\', set directory above</string >
309
310
<string name =" directory_hint" >Directory</string >
310
311
<string name =" new_folder_set_gpg_key" >Set GPG key for directory</string >
You can’t perform that action at this time.
0 commit comments