From 72f147b9e82a2ef726f8a8c277ee906aa0d85d96 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 6 Dec 2017 16:06:20 +0100 Subject: Made signaturedetails slightly more readable --- framework/src/domain/mime/partmodel.cpp | 52 ++++++++++++++++++--------------- framework/src/domain/mime/partmodel.h | 52 ++++++++++++++++----------------- 2 files changed, 54 insertions(+), 50 deletions(-) diff --git a/framework/src/domain/mime/partmodel.cpp b/framework/src/domain/mime/partmodel.cpp index bf11b52d..c4e002b7 100644 --- a/framework/src/domain/mime/partmodel.cpp +++ b/framework/src/domain/mime/partmodel.cpp @@ -139,6 +139,32 @@ static QString addCss(const QString &s) return header + s + QStringLiteral(""); } + +SignatureInfo *signatureInfo(MimeTreeParser::MessagePart *messagePart) +{ + auto signatureInfo = new SignatureInfo; + const auto signatureParts = messagePart->signatures(); + if (signatureParts.size() > 1) { + qWarning() << "Can't deal with more than one signature"; + } + for (const auto &p : signatureParts) { + signatureInfo->keyId = p->partMetaData()->keyId; + signatureInfo->keyMissing = p->partMetaData()->sigSummary & GpgME::Signature::KeyMissing; + signatureInfo->keyExpired = p->partMetaData()->sigSummary & GpgME::Signature::KeyExpired; + signatureInfo->keyRevoked = p->partMetaData()->sigSummary & GpgME::Signature::KeyRevoked; + signatureInfo->sigExpired = p->partMetaData()->sigSummary & GpgME::Signature::SigExpired; + signatureInfo->crlMissing = p->partMetaData()->sigSummary & GpgME::Signature::CrlMissing; + signatureInfo->crlTooOld = p->partMetaData()->sigSummary & GpgME::Signature::CrlTooOld; + signatureInfo->signer = p->partMetaData()->signer; + signatureInfo->signClass = p->partMetaData()->signClass; + signatureInfo->signerMailAddresses = p->partMetaData()->signerMailAddresses; + signatureInfo->signatureIsGood = p->partMetaData()->isGoodSignature; + signatureInfo->keyIsTrusted = p->partMetaData()->keyTrust & GpgME::Signature::Full || + p->partMetaData()->keyTrust & GpgME::Signature::Ultimate; + } + return signatureInfo; +} + QVariant PartModel::data(const QModelIndex &index, int role) const { if (!index.isValid()) { @@ -236,30 +262,8 @@ QVariant PartModel::data(const QModelIndex &index, int role) const //No info return "unknown"; } - case SignatureDetails: { - auto signatureInfo = new SignatureInfo; - - const auto signatureParts = messagePart->signatures(); - if (signatureParts.size() > 1) { - qWarning() << "Can't deal with more than one signature"; - } - for (const auto &p : signatureParts) { - signatureInfo->mKeyId = p->partMetaData()->keyId; - signatureInfo->mKeyMissing = p->partMetaData()->sigSummary & GpgME::Signature::KeyMissing; - signatureInfo->mKeyExpired = p->partMetaData()->sigSummary & GpgME::Signature::KeyExpired; - signatureInfo->mKeyRevoked = p->partMetaData()->sigSummary & GpgME::Signature::KeyRevoked; - signatureInfo->mSigExpired = p->partMetaData()->sigSummary & GpgME::Signature::SigExpired; - signatureInfo->mCrlMissing = p->partMetaData()->sigSummary & GpgME::Signature::CrlMissing; - signatureInfo->mCrlTooOld = p->partMetaData()->sigSummary & GpgME::Signature::CrlTooOld; - signatureInfo->mSigner = p->partMetaData()->signer; - signatureInfo->mSignClass = p->partMetaData()->signClass; - signatureInfo->mSignerMailAddresses = p->partMetaData()->signerMailAddresses; - signatureInfo->mSignatureIsGood = p->partMetaData()->isGoodSignature; - signatureInfo->mKeyIsTrusted = p->partMetaData()->keyTrust & GpgME::Signature::Full || - p->partMetaData()->keyTrust & GpgME::Signature::Ultimate; - } - return QVariant::fromValue(signatureInfo); - } + case SignatureDetails: + return QVariant::fromValue(signatureInfo(messagePart)); case ErrorType: return messagePart->error(); case ErrorString: { diff --git a/framework/src/domain/mime/partmodel.h b/framework/src/domain/mime/partmodel.h index c925c291..e48ab81d 100644 --- a/framework/src/domain/mime/partmodel.h +++ b/framework/src/domain/mime/partmodel.h @@ -67,33 +67,33 @@ private: class SignatureInfo : public QObject { Q_OBJECT - Q_PROPERTY(QByteArray keyId MEMBER mKeyId CONSTANT) - Q_PROPERTY(bool keyMissing MEMBER mKeyMissing CONSTANT) - Q_PROPERTY(bool keyRevoked MEMBER mKeyRevoked CONSTANT) - Q_PROPERTY(bool keyExpired MEMBER mKeyExpired CONSTANT) - Q_PROPERTY(bool sigExpired MEMBER mSigExpired CONSTANT) - Q_PROPERTY(bool crlMissing MEMBER mCrlMissing CONSTANT) - Q_PROPERTY(bool crlTooOld MEMBER mCrlTooOld CONSTANT) - - Q_PROPERTY(QString signer MEMBER mSigner CONSTANT) - Q_PROPERTY(QString signClass MEMBER mSignClass CONSTANT) - Q_PROPERTY(QStringList signerMailAddresses MEMBER mSignerMailAddresses CONSTANT) - Q_PROPERTY(bool signatureIsGood MEMBER mSignatureIsGood CONSTANT) - Q_PROPERTY(bool keyIsTrusted MEMBER mKeyIsTrusted CONSTANT) + Q_PROPERTY(QByteArray keyId MEMBER keyId CONSTANT) + Q_PROPERTY(bool keyMissing MEMBER keyMissing CONSTANT) + Q_PROPERTY(bool keyRevoked MEMBER keyRevoked CONSTANT) + Q_PROPERTY(bool keyExpired MEMBER keyExpired CONSTANT) + Q_PROPERTY(bool sigExpired MEMBER sigExpired CONSTANT) + Q_PROPERTY(bool crlMissing MEMBER crlMissing CONSTANT) + Q_PROPERTY(bool crlTooOld MEMBER crlTooOld CONSTANT) + + Q_PROPERTY(QString signer MEMBER signer CONSTANT) + Q_PROPERTY(QString signClass MEMBER signClass CONSTANT) + Q_PROPERTY(QStringList signerMailAddresses MEMBER signerMailAddresses CONSTANT) + Q_PROPERTY(bool signatureIsGood MEMBER signatureIsGood CONSTANT) + Q_PROPERTY(bool keyIsTrusted MEMBER keyIsTrusted CONSTANT) public: - bool mKeyRevoked = false; - bool mKeyExpired = false; - bool mSigExpired = false; - bool mKeyMissing = false; - bool mCrlMissing = false; - bool mCrlTooOld = false; - QByteArray mKeyId; - - QString mSigner; - QString mSignClass; - QStringList mSignerMailAddresses; - bool mSignatureIsGood = false; - bool mKeyIsTrusted = false; + bool keyRevoked = false; + bool keyExpired = false; + bool sigExpired = false; + bool keyMissing = false; + bool crlMissing = false; + bool crlTooOld = false; + QByteArray keyId; + + QString signer; + QString signClass; + QStringList signerMailAddresses; + bool signatureIsGood = false; + bool keyIsTrusted = false; }; -- cgit v1.2.3