From 63f8de00239153e3221d5298a184f52d0c664d35 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 25 Jan 2017 23:11:14 +0000
Subject: [PATCH] Remove by key id

---
 src/freedombone-controlpanel-user | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/freedombone-controlpanel-user b/src/freedombone-controlpanel-user
index 7efdc93e..9cb6803b 100755
--- a/src/freedombone-controlpanel-user
+++ b/src/freedombone-controlpanel-user
@@ -469,7 +469,7 @@ function remove_gpg_key {
     trap "rm -f $data" 0 1 2 5 15
     dialog --title $"Remove someone's PGP/GPG key" \
            --backtitle $"Freedombone User Control Panel" \
-           --inputbox $"Enter their email address below" 8 60 2>$data
+           --inputbox $"Enter their email address or key ID below" 8 60 2>$data
     sel=$?
     case $sel in
         0)
@@ -485,9 +485,14 @@ function remove_gpg_key {
                                --msgbox $"It's not a good idea to remove your own encryption key" 6 65
                     fi
                 else
-                    dialog --title $"Unrecognised email address" \
-                           --backtitle $"Freedombone User Control Panel" \
-                           --msgbox $"This doesn't look like an email address" 6 50
+                    if [[ $REMOVE_EMAIL_ADDRESS == "0x"* ]]; then
+                        clear
+                        gpg --delete-key $REMOVE_EMAIL_ADDRESS
+                    else
+                        dialog --title $"Unrecognised email address" \
+                               --backtitle $"Freedombone User Control Panel" \
+                               --msgbox $"This doesn't look like an email address" 6 50
+                    fi
                 fi
             fi
             ;;