OPENPGP PLUGIN: Don't list expired/revoked GPG keyopenpgp-plugin-hide-revoked-expired

	- 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.

1 files changed, 13 insertions, 1 deletions

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");
                 }
             }