Page MenuHome GnuPG
Files F23020913

No OneTemporary
Actions

View Options

diff --git a/src/core/messageparser.cpp b/src/core/messageparser.cpp
index 7fcb46f..0277e67 100644
--- a/src/core/messageparser.cpp
+++ b/src/core/messageparser.cpp
@@ -1,174 +1,187 @@
// SPDX-FileCopyrightText: 2016 Christian Mollekopf <mollekopf@kolabsys.com>
// SPDX-License-Identifier: LGPL-2.0-or-later
#include "messageparser.h"
#include "attachmentmodel.h"
#include "mimetreeparser_core_debug.h"
#include "objecttreeparser.h"
#include "partmodel.h"
#include <KLocalizedString>
#include <QElapsedTimer>
namespace
{
template<typename T>
-const T *findHeader(KMime::Content *content)
-{
+const T *findHeader(KMime::Content *content, KMime::Content *fallbackContent)
+{
+ if (fallbackContent) {
+ const auto contentType = fallbackContent->contentType();
+ if (contentType->hasParameter(QStringLiteral("protected-headers"))) {
+ auto header = fallbackContent->header<T>();
+ if (header) {
+ return header;
+ }
+ }
+ }
+
auto header = content->header<T>();
if (header || !content->parent()) {
return header;
}
- return findHeader<T>(content->parent());
+ return findHeader<T>(content->parent(), nullptr);
}
const KMime::Headers::Base *findHeader(KMime::Content *content, const char *headerType)
{
const auto header = content->headerByType(headerType);
if (header || !content->parent()) {
return header;
}
return findHeader(content->parent(), headerType);
}
}
class MessagePartPrivate
{
public:
std::shared_ptr<MimeTreeParser::ObjectTreeParser> mParser;
KMime::Message::Ptr mMessage;
+ KMime::Content *node = nullptr;
};
MessageParser::MessageParser(QObject *parent)
: QObject(parent)
, d(std::unique_ptr<MessagePartPrivate>(new MessagePartPrivate))
{
}
MessageParser::~MessageParser()
{
}
KMime::Message::Ptr MessageParser::message() const
{
return d->mMessage;
}
void MessageParser::setMessage(const KMime::Message::Ptr message)
{
if (message == d->mMessage) {
return;
}
if (!message) {
qCWarning(MIMETREEPARSER_CORE_LOG) << Q_FUNC_INFO << "Empty message given";
return;
}
d->mMessage = message;
QElapsedTimer time;
time.start();
auto parser = std::make_shared<MimeTreeParser::ObjectTreeParser>();
parser->parseObjectTree(message.data());
qCDebug(MIMETREEPARSER_CORE_LOG) << "Message parsing took: " << time.elapsed();
parser->decryptParts();
qCDebug(MIMETREEPARSER_CORE_LOG) << "Message parsing and decryption/verification: " << time.elapsed();
d->mParser = parser;
+ const auto contentParts = parser->collectContentParts();
+ for (const auto &part : parser->collectContentParts()) {
+ if (auto subjectHeader = part->node()->header<KMime::Headers::Subject>()) {
+ if (!subjectHeader->asUnicodeString().isEmpty()) {
+ d->node = part->node();
+ }
+ }
+ }
+
Q_EMIT htmlChanged();
}
bool MessageParser::loaded() const
{
return bool{d->mParser};
}
QString MessageParser::structureAsString() const
{
if (!d->mParser) {
return {};
}
return d->mParser->structureAsString();
}
PartModel *MessageParser::parts() const
{
if (!d->mParser) {
return nullptr;
}
const auto model = new PartModel(d->mParser);
return model;
}
AttachmentModel *MessageParser::attachments() const
{
if (!d->mParser) {
return nullptr;
}
return new AttachmentModel(d->mParser);
}
QString MessageParser::subject() const
{
if (d->mMessage) {
- const auto header = findHeader<KMime::Headers::Subject>(d->mMessage.get());
- if (!header) {
- return {};
+ const auto header = findHeader<KMime::Headers::Subject>(d->mMessage.get(), d->node);
+ if (header) {
+ return header->asUnicodeString();
}
- return header->asUnicodeString();
- } else {
- return QString();
}
+
+ return QString();
}
QString MessageParser::from() const
{
if (d->mMessage) {
- const auto header = findHeader<KMime::Headers::From>(d->mMessage.get());
- if (!header) {
- return {};
+ const auto header = findHeader<KMime::Headers::From>(d->mMessage.get(), d->node);
+ if (header) {
+ return header->displayString();
}
- return header->displayString();
- } else {
- return QString();
}
+ return QString();
}
QString MessageParser::sender() const
{
if (d->mMessage) {
- const auto header = findHeader<KMime::Headers::Sender>(d->mMessage.get());
- if (!header) {
- return {};
+ const auto header = findHeader<KMime::Headers::Sender>(d->mMessage.get(), d->node);
+ if (header) {
+ return header->displayString();
}
- return header->displayString();
- } else {
- return QString();
}
+
+ return QString();
}
QString MessageParser::to() const
{
if (d->mMessage) {
- const auto header = findHeader<KMime::Headers::To>(d->mMessage.get());
+ const auto header = findHeader<KMime::Headers::To>(d->mMessage.get(), d->node);
if (!header) {
return {};
}
return header->displayString();
- } else {
- return i18nc("displayed when a mail has unknown sender, receiver or date", "Unknown");
}
+ return QString();
}
QDateTime MessageParser::date() const
{
if (d->mMessage) {
- const auto header = findHeader<KMime::Headers::Date>(d->mMessage.get());
- if (!header) {
- return {};
+ const auto header = findHeader<KMime::Headers::Date>(d->mMessage.get(), d->node);
+ if (header) {
+ return header->dateTime();
}
- return header->dateTime();
- } else {
- return QDateTime();
}
+ return QDateTime();
}

File Metadata

Mime Type
text/x-diff
Expires
Mon, May 12, 6:51 PM (15 h, 30 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
61/fa/81a4e3286065907feb18d7c2f63b

Event Timeline