diff options
Diffstat (limited to 'plugins/openpgp')
| -rw-r--r-- | plugins/openpgp/src/encryption_list_entry.vala | 8 | ||||
| -rw-r--r-- | plugins/openpgp/src/encryption_preferences_entry.vala | 14 |
2 files changed, 21 insertions, 1 deletions
diff --git a/plugins/openpgp/src/encryption_list_entry.vala b/plugins/openpgp/src/encryption_list_entry.vala index cf5da8c4..8aba1522 100644 --- a/plugins/openpgp/src/encryption_list_entry.vala +++ b/plugins/openpgp/src/encryption_list_entry.vala @@ -40,6 +40,14 @@ private class EncryptionListEntry : Plugins.EncryptionListEntry, Object { return; } + GPG.Key key_check = GPGHelper.get_public_key(db.get_account_key(conversation.account)); + if (key_check.expired || key_check.revoked){ + string status_str = key_check.expired ? " is expired." : " is revoked."; + debug("GPG public key %s is NOT fine for encryption: it %s.\n", key_check.fpr, status_str); + input_status_callback(new Plugins.InputFieldStatus("Your GPG key " + key_check.fpr + status_str, Plugins.InputFieldStatus.MessageType.ERROR, Plugins.InputFieldStatus.InputState.NO_SEND)); + return; + } + if (conversation.type_ == Conversation.Type.CHAT) { string? key_id = stream_interactor.get_module(Manager.IDENTITY).get_key_id(conversation.account, conversation.counterpart); if (key_id == null) { diff --git a/plugins/openpgp/src/encryption_preferences_entry.vala b/plugins/openpgp/src/encryption_preferences_entry.vala index 4620e173..e110116d 100644 --- a/plugins/openpgp/src/encryption_preferences_entry.vala +++ b/plugins/openpgp/src/encryption_preferences_entry.vala @@ -51,10 +51,22 @@ namespace Dino.Plugins.OpenPgp { #endif string_list.append(_("Disabled")); + + // Cleanup revoked or expired keys, except if linked to an account + for (int i = 0; i < keys.size; i++) { + if (keys[i].revoked || keys[i].expired){ + if (keys[i].fpr != plugin.db.get_account_key(account)) keys.remove(keys[i]); + } + } + for (int i = 0; i < keys.size; i++) { - string_list.append(@"$(keys[i].uids[0].uid)\n$(keys[i].fpr.substring(24, 16))"); + var key_status=""; + if (keys[i].revoked) key_status = _("\nKey is revoked!"); + if (keys[i].expired) key_status = _("\nKey is expired!"); + string_list.append(@"$(keys[i].uids[0].uid)\n$(keys[i].fpr.substring(24, 16))$(key_status)"); if (keys[i].fpr == plugin.db.get_account_key(account)) { drop_down.selected = i + 1; + if (keys[i].expired || keys[i].revoked) drop_down.add_css_class("error"); } } |