From 9f988590992a9d7caf1408115176b775be1b45ac Mon Sep 17 00:00:00 2001
From: SET <nmset@yandex.com>
Date: Fri, 6 Nov 2020 17:08:22 +0100
Subject: [PATCH] Fix status report.

Key, uid and signature status well all comparedtot IsBad(), copy/paste
woes.
Show also if key is secret.
---
 Tools.cpp              | 27 ++++++++++++++-------------
 WTAPPROOT/K7/K7.xml    |  3 ++-
 WTAPPROOT/K7/K7_fr.xml |  1 +
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Tools.cpp b/Tools.cpp
index 2ab3add..6b59968 100644
--- a/Tools.cpp
+++ b/Tools.cpp
@@ -50,11 +50,12 @@ WString Tools::GetKeyStatus(const GpgME::Key& k)
     status += WString(" ");
     status += WString(k.keyID()) + WString(" :") + nl + nl;
     status += WString(WString::tr("KeyStatusIsBad")) + sep + TexttualBool(k.isBad()) + nl;
-    status += WString(WString::tr("KeyStatusIsNull")) + sep + TexttualBool(k.isBad()) + nl;
-    status += WString(WString::tr("KeyStatusIsInvalid")) + sep + TexttualBool(k.isBad()) + nl;
-    status += WString(WString::tr("KeyStatusIsDisabled")) + sep + TexttualBool(k.isBad()) + nl;
-    status += WString(WString::tr("KeyStatusIsExpired")) + sep + TexttualBool(k.isBad()) + nl;
-    status += WString(WString::tr("KeyStatusIsRevoked")) + sep + TexttualBool(k.isBad());
+    status += WString(WString::tr("KeyStatusIsNull")) + sep + TexttualBool(k.isNull()) + nl;
+    status += WString(WString::tr("KeyStatusIsInvalid")) + sep + TexttualBool(k.isInvalid()) + nl;
+    status += WString(WString::tr("KeyStatusIsDisabled")) + sep + TexttualBool(k.isDisabled()) + nl;
+    status += WString(WString::tr("KeyStatusIsExpired")) + sep + TexttualBool(k.isExpired()) + nl;
+    status += WString(WString::tr("KeyStatusIsRevoked")) + sep + TexttualBool(k.isRevoked()) + nl + nl;
+    status += WString(WString::tr("KeyTypeIsSecret")) + sep + TexttualBool(k.isSecret());
     
     return status;
 }
@@ -66,9 +67,9 @@ WString Tools::GetUidStatus(const GpgME::UserID& uid)
     WString status(WString::tr("UserStatus"));
     status += WString(" :") + nl + nl;
     status += WString(WString::tr("UserStatusIsBad")) + sep + TexttualBool(uid.isBad()) + nl;
-    status += WString(WString::tr("UserStatusIsNull")) + sep + TexttualBool(uid.isBad()) + nl;
-    status += WString(WString::tr("UserStatusIsInvalid")) + sep + TexttualBool(uid.isBad()) + nl;
-    status += WString(WString::tr("UserStatusIsRevoked")) + sep + TexttualBool(uid.isBad());
+    status += WString(WString::tr("UserStatusIsNull")) + sep + TexttualBool(uid.isNull()) + nl;
+    status += WString(WString::tr("UserStatusIsInvalid")) + sep + TexttualBool(uid.isInvalid()) + nl;
+    status += WString(WString::tr("UserStatusIsRevoked")) + sep + TexttualBool(uid.isRevoked());
     
     return status;
 }
@@ -80,11 +81,11 @@ WString Tools::GetSigStatus(const GpgME::UserID::Signature& sig)
     WString status(WString::tr("SigStatus"));
     status += WString(" :") + nl + nl;
     status += WString(WString::tr("SigStatusIsBad")) + sep + TexttualBool(sig.isBad()) + nl;
-    status += WString(WString::tr("SigStatusIsNull")) + sep + TexttualBool(sig.isBad()) + nl;
-    status += WString(WString::tr("SigStatusIsInvalid")) + sep + TexttualBool(sig.isBad()) + nl;
-    status += WString(WString::tr("SigStatusIsExportable")) + sep + TexttualBool(sig.isBad()) + nl;
-    status += WString(WString::tr("SigStatusIsExpired")) + sep + TexttualBool(sig.isBad()) + nl;
-    status += WString(WString::tr("SigStatusIsRevokation")) + sep + TexttualBool(sig.isBad());
+    status += WString(WString::tr("SigStatusIsNull")) + sep + TexttualBool(sig.isNull()) + nl;
+    status += WString(WString::tr("SigStatusIsInvalid")) + sep + TexttualBool(sig.isInvalid()) + nl;
+    status += WString(WString::tr("SigStatusIsExportable")) + sep + TexttualBool(sig.isExportable()) + nl;
+    status += WString(WString::tr("SigStatusIsExpired")) + sep + TexttualBool(sig.isExpired()) + nl;
+    status += WString(WString::tr("SigStatusIsRevokation")) + sep + TexttualBool(sig.isRevokation());
     
     return status;
 }
diff --git a/WTAPPROOT/K7/K7.xml b/WTAPPROOT/K7/K7.xml
index 466821b..415dc44 100644
--- a/WTAPPROOT/K7/K7.xml
+++ b/WTAPPROOT/K7/K7.xml
@@ -89,6 +89,7 @@
     <message id='KeyStatusIsDisabled'>Disabled</message>
     <message id='KeyStatusIsExpired'>Expired</message>
     <message id='KeyStatusIsRevoked'>Revoked</message>
+    <message id='KeyTypeIsSecret'>Secret</message>
     
     <message id='UserStatus'>User status</message>
     <message id='UserStatusIsBad'>Bad</message>
@@ -102,6 +103,6 @@
     <message id='SigStatusIsInvalid'>Invalid</message>
     <message id='SigStatusIsExportable'>Exportable</message>
     <message id='SigStatusIsExpired'>Expired</message>
-    <message id='SigStatusIsRevokation'>Revokation</message>
+    <message id='SigStatusIsRevokation'>Revocation</message>
     
  </messages>
\ No newline at end of file
diff --git a/WTAPPROOT/K7/K7_fr.xml b/WTAPPROOT/K7/K7_fr.xml
index 5fb99ec..6dcd5a2 100644
--- a/WTAPPROOT/K7/K7_fr.xml
+++ b/WTAPPROOT/K7/K7_fr.xml
@@ -89,6 +89,7 @@
     <message id='KeyStatusIsDisabled'>Désactivé</message>
     <message id='KeyStatusIsExpired'>Expiré</message>
     <message id='KeyStatusIsRevoked'>Revoqué</message>
+    <message id='KeyTypeIsSecret'>Secret</message>
     
     <message id='UserStatus'>État de l'utilisateur</message>
     <message id='UserStatusIsBad'>Mauvais</message>