From 0f5eb0a41164177715667e271b01015d4348ab69 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 16 Jul 2018 10:34:10 +0200 Subject: signatureIsGood is a catchall so we have to check for that at the end. --- components/mailviewer/qml/MailDataModel.qml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/components/mailviewer/qml/MailDataModel.qml b/components/mailviewer/qml/MailDataModel.qml index 099548bf..ab63e8f5 100644 --- a/components/mailviewer/qml/MailDataModel.qml +++ b/components/mailviewer/qml/MailDataModel.qml @@ -51,12 +51,9 @@ DelegateModel { var details = ""; if (signatureDetails.noSignaturesFound) { details += qsTr("This message has been signed but we failed to validate the signature.") + "\n" - } else if (!signatureDetails.signatureIsGood) { - details += qsTr("This message is signed but the signature is invalid.") + "\n" } else if (signatureDetails.keyMissing) { details += qsTr("This message has been signed using the key %1.").arg(signatureDetails.keyId) + "\n"; details += qsTr("The key details are not available.") + "\n"; - return details; } else { details += qsTr("This message has been signed using the key %1 by %2.").arg(signatureDetails.keyId).arg(signatureDetails.signer) + "\n"; if (signatureDetails.keyRevoked) { @@ -68,7 +65,9 @@ DelegateModel { if (signatureDetails.keyIsTrusted) { details += qsTr("You are trusting this key.") + "\n" } - } + if (!signatureDetails.signatureIsGood && !signatureDetails.keyRevoked && !signatureDetails.keyExpired && !signatureDetails.keyIsTrusted) { + details += qsTr("The signature is invalid.") + "\n" + } return details } -- cgit v1.2.3