From 28529f0038543e8a7fef2f10ef8231355a0dbca3 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 - Blocks input in chat box if the key in use becomes revoked or expired - Mention GPG key status below chat input box if it's expired or revoked - Account manager will show a warning message: "Key is revoked/expired!" below the selected GPG key for the corresponding account. --- plugins/openpgp/src/encryption_preferences_entry.vala | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'plugins/openpgp/src/encryption_preferences_entry.vala') 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"); } } -- cgit v1.2.3-70-g09d2