From 78664dd4ef6d9777308df494e4d8abcfb2f421d4 Mon Sep 17 00:00:00 2001 From: Miquel Lionel Date: Sat, 20 Jan 2024 14:24:30 +0100 Subject: OPENPGP PLUGIN: Don't list expired/revoked GPG key - closes #91 - Mention that GPG key may be expired or revoked in chat input box - in the account dialog if the number of OpenPGP keys found is 0, the label also notes that a key may have been revoked or expired. - blocks input in chat box if key is use is revoked or expired when switching conversation and can detect if your key has expired while chatting - if current selected key is revoked or expired, it'll be shown in account manager with a warning message: "Attention required: your key xxxx is revoked/expired!" --- plugins/openpgp/src/account_settings_entry.vala | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'plugins/openpgp/src/account_settings_entry.vala') diff --git a/plugins/openpgp/src/account_settings_entry.vala b/plugins/openpgp/src/account_settings_entry.vala index 7c99942f..0e28c68e 100644 --- a/plugins/openpgp/src/account_settings_entry.vala +++ b/plugins/openpgp/src/account_settings_entry.vala @@ -69,7 +69,7 @@ public class AccountSettingsEntry : Plugins.AccountSettingsEntry { return; } if (keys.size == 0) { - label.set_markup(build_markup_string(_("Key publishing disabled"), _("No keys available. Generate one!"))); + label.set_markup(build_markup_string(_("Key publishing disabled"), _("No keys available. Generate one or check if your keys aren't expired or revoked!"))); return; } @@ -88,6 +88,18 @@ public class AccountSettingsEntry : Plugins.AccountSettingsEntry { set_label_active(selected); combobox.changed.connect(key_changed); + if (account_key != null){ + try { + GPG.Key key_check = GPGHelper.get_public_key(account_key); + if(key_check.expired || key_check.revoked) { + string status_str = key_check.expired ? _("expired!") : _("revoked!"); + label.set_markup(build_markup_string(_("Attention required!"), _("Your key "+ key_check.fpr +" is " + status_str))); + } + } + catch { + debug("Coudn't check GPG key status."); + } + } } private void populate_list_store() { @@ -160,4 +172,4 @@ public class AccountSettingsEntry : Plugins.AccountSettingsEntry { return stack; } } -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2