Only fetch every mail once.

2 files changed, 7 insertions, 5 deletions

diff --git a/framework/domain/maillistmodel.cpp b/framework/domain/maillistmodel.cpp
index e0b74a3a..58a6b384 100644
--- a/framework/domain/maillistmodel.cpp
+++ b/framework/domain/maillistmodel.cpp
@@ -20,9 +20,6 @@
 
 #include "maillistmodel.h"
 
-#include <QFile>
-#include <QDateTime>
-
 #include <sink/standardqueries.h>
 
 MailListModel::MailListModel(QObject *parent)
@@ -74,10 +71,11 @@ static QString join(const QList<Sink::ApplicationDomain::Mail::Contact> &contact
     return list.join(", ");
 }
 
-void fetchMail(Sink::ApplicationDomain::Mail::Ptr mail)
+void MailListModel::fetchMail(Sink::ApplicationDomain::Mail::Ptr mail) const
 {
-    if (mail && !mail->getFullPayloadAvailable()) {
+    if (mail && !mail->getFullPayloadAvailable() && !mFetchedMails.contains(mail->identifier())) {
         qDebug() << "Fetching mail: " << mail->identifier() << mail->getSubject();
+        mFetchedMails.insert(mail->identifier());
         Sink::Store::synchronize(Sink::SyncScope{*mail}).exec();
     }
 }
@@ -208,6 +206,7 @@ void MailListModel::setMail(const QVariant &variant)
     query.request<Mail::MimeMessage>();
     query.request<Mail::FullPayloadAvailable>();
     mFetchMails = true;
+    mFetchedMails.clear();
     qDebug() << "Running mail query: " << mail->resourceInstanceIdentifier() << mail->identifier();
     //Latest mail at the bottom
     sort(0, Qt::AscendingOrder);
diff --git a/framework/domain/maillistmodel.h b/framework/domain/maillistmodel.h
index 8c2609e0..af079a1b 100644
--- a/framework/domain/maillistmodel.h
+++ b/framework/domain/maillistmodel.h
@@ -70,7 +70,10 @@ public:
     QVariant mail() const;
 
 private:
+    void fetchMail(Sink::ApplicationDomain::Mail::Ptr mail) const;
+
     QSharedPointer<QAbstractItemModel> m_model;
     bool mFetchMails = false;
+    mutable QSet<QByteArray> mFetchedMails;
     QByteArray mCurrentQueryItem;
 };