Commit 6d45d462 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/20.04'

parents 833636f9 7bdfd56d
......@@ -51,6 +51,7 @@ QVector<DKIMCheckSignatureJob::DKIMCheckSignatureAuthenticationResult> DKIMAuthe
DKIMCheckSignatureJob::DKIMCheckSignatureAuthenticationResult convertedResult;
convertedResult.method = MessageViewer::DKIMUtil::convertAuthenticationMethodStringToEnum(info.method);
const QString &infoResult = info.result;
convertedResult.infoResult = infoResult;
if (infoResult == QLatin1String("none")) {
convertedResult.status = DKIMCheckSignatureJob::DKIMStatus::EmailNotSigned;
} else if (infoResult == QLatin1String("pass")) {
......
......@@ -704,6 +704,7 @@ QDebug operator <<(QDebug d, const DKIMCheckSignatureJob::DKIMCheckSignatureAuth
d << " status " << t.status;
d << " sdid " << t.sdid;
d << " auid " << t.auid;
d << " inforesult " << t.infoResult;
return d;
}
......@@ -713,7 +714,8 @@ bool DKIMCheckSignatureJob::DKIMCheckSignatureAuthenticationResult::operator==(c
method == other.method &&
status == other.status &&
sdid == other.sdid &&
auid == other.auid;
auid == other.auid &&
infoResult == other.infoResult;
}
bool DKIMCheckSignatureJob::DKIMCheckSignatureAuthenticationResult::isValid() const
......
......@@ -93,6 +93,7 @@ public:
struct DKIMCheckSignatureAuthenticationResult {
QString errorStr;
QString infoResult;
AuthenticationMethod method = AuthenticationMethod::Unknown;
DKIMCheckSignatureJob::DKIMStatus status = DKIMCheckSignatureJob::DKIMStatus::Unknown;
QString sdid; //Signing Domain Identifier
......
Markdown is supported
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