Commit d031959e authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

Move "No MDC" hint before information on recipients

Before, information on unknown recipients was shown (with early exit)
before the "No MDC" hint, i.e. in case of a symmetrically encrypted
message with additional public key encryption the "No MDC" hint
would not have been shown.

GnuPG-bug-id: 5535
parent d0d25f71
......@@ -566,10 +566,6 @@ static QString formatDecryptionResultDetails(const DecryptionResult &res, const
+ QLatin1String("<br/>");
}
if (recipients.empty() && res.numRecipients() > 0) {
return details + QLatin1String("<i>") + i18np("One unknown recipient.", "%1 unknown recipients.", res.numRecipients()) + QLatin1String("</i>");
}
if (res.isLegacyCipherNoMDC()) {
details += i18nc("Integrity protection was missing because an old cipher was used.",
"<b>Hint:</b> If this file was encrypted before the year 2003 it is "
......@@ -580,6 +576,10 @@ static QString formatDecryptionResultDetails(const DecryptionResult &res, const
QStringLiteral("<br/><br/>");
}
if (recipients.empty() && res.numRecipients() > 0) {
return details + QLatin1String("<i>") + i18np("One unknown recipient.", "%1 unknown recipients.", res.numRecipients()) + QLatin1String("</i>");
}
if (!recipients.empty()) {
details += i18np("Recipient:", "Recipients:", res.numRecipients());
if (res.numRecipients() == 1) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment