4 files changed, 61 insertions, 19 deletions

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 2dfb2ea..02713b3 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -384,21 +384,36 @@ public:
                 flags << Imap::Flags::Flagged;
             }
 
-            QByteArray content = KMime::LFtoCRLF(mail.getMimeMessage());
-            QDateTime internalDate = mail.getDate();
-            auto rid = QSharedPointer<QByteArray>::create();
-            KIMAP::ImapSet set;
-            set.add(uid);
-            return login.then(imap->append(mailbox, content, flags, internalDate))
-                .then<void, qint64>([imap, mailbox, rid](qint64 uid) {
-                    const auto remoteId = mailbox + "/" + QByteArray::number(uid);
-                    Trace() << "Finished creating a modified mail: " << remoteId;
-                    *rid = remoteId;
-                })
-                .then(imap->remove(mailbox, set))
-                .then<QByteArray>([rid, imap]() {
-                   return *rid; 
-                });
+            bool messageChanged = false;
+            if (messageChanged) {
+                QByteArray content = KMime::LFtoCRLF(mail.getMimeMessage());
+                QDateTime internalDate = mail.getDate();
+                auto rid = QSharedPointer<QByteArray>::create();
+                KIMAP::ImapSet set;
+                set.add(uid);
+                return login.then(imap->append(mailbox, content, flags, internalDate))
+                    .then<void, qint64>([imap, mailbox, rid](qint64 uid) {
+                        const auto remoteId = mailbox + "/" + QByteArray::number(uid);
+                        Trace() << "Finished creating a modified mail: " << remoteId;
+                        *rid = remoteId;
+                    })
+                    .then(imap->remove(mailbox, set))
+                    .then<QByteArray>([rid, imap]() {
+                        return *rid; 
+                    });
+            } else {
+                KIMAP::ImapSet set;
+                set.add(uid);
+                return login.then(imap->select(mailbox))
+                    .then(imap->storeFlags(set, flags))
+                    .then<void, qint64>([imap, mailbox](qint64 uid) {
+                        const auto remoteId = mailbox + "/" + QByteArray::number(uid);
+                        Trace() << "Finished modifying mail: " << remoteId;
+                    })
+                    .then<QByteArray>([oldRemoteId, imap]() {
+                        return oldRemoteId; 
+                    });
+            }
         }
         return KAsync::null<QByteArray>();
     }
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index 1414dbe..ddda2e9 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -132,11 +132,35 @@ KAsync::Job<qint64> ImapServerProxy::append(const QString &mailbox, const QByteA
 
 KAsync::Job<void> ImapServerProxy::store(const KIMAP::ImapSet &set, const QList<QByteArray> &flags)
 {
+    return storeFlags(set, flags);
+}
+
+KAsync::Job<void> ImapServerProxy::storeFlags(const KIMAP::ImapSet &set, const QList<QByteArray> &flags)
     auto store = new KIMAP::StoreJob(mSession);
     store->setUidBased(true);
+    store->setMode(KIMAP::StoreJob::SetFlags);
     store->setSequenceSet(set);
     store->setFlags(flags);
+    return runJob(store);
+}
+
+KAsync::Job<void> ImapServerProxy::addFlags(const KIMAP::ImapSet &set, const QList<QByteArray> &flags)
+{
+    auto store = new KIMAP::StoreJob(mSession);
+    store->setUidBased(true);
     store->setMode(KIMAP::StoreJob::AppendFlags);
+    store->setSequenceSet(set);
+    store->setFlags(flags);
+    return runJob(store);
+}
+
+KAsync::Job<void> ImapServerProxy::removeFlags(const KIMAP::ImapSet &set, const QList<QByteArray> &flags)
+{
+    auto store = new KIMAP::StoreJob(mSession);
+    store->setUidBased(true);
+    store->setMode(KIMAP::StoreJob::RemoveFlags);
+    store->setSequenceSet(set);
+    store->setFlags(flags);
     return runJob(store);
 }
 
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index 3afeee5..05409c5 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -69,6 +69,9 @@ public:
     KAsync::Job<void> select(const QString &mailbox);
     KAsync::Job<qint64> append(const QString &mailbox, const QByteArray &content, const QList<QByteArray> &flags = QList<QByteArray>(), const QDateTime &internalDate = QDateTime());
     KAsync::Job<void> store(const KIMAP::ImapSet &set, const QList<QByteArray> &flags);
+    KAsync::Job<void> storeFlags(const KIMAP::ImapSet &set, const QList<QByteArray> &flags);
+    KAsync::Job<void> addFlags(const KIMAP::ImapSet &set, const QList<QByteArray> &flags);
+    KAsync::Job<void> removeFlags(const KIMAP::ImapSet &set, const QList<QByteArray> &flags);
     KAsync::Job<void> create(const QString &mailbox);
     KAsync::Job<void> rename(const QString &mailbox, const QString &newMailbox);
     KAsync::Job<void> remove(const QString &mailbox);
diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index 912bb1c..9411f91 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -231,7 +231,7 @@ void MailTest::testMarkMailAsRead()
     auto mail = Mail::create(mResourceInstanceIdentifier);
     mail.setMimeMessage(message->encodedContent());
     mail.setFolder(folder);
-    mail.setUnread(false);
+    mail.setUnread(true);
     VERIFYEXEC(Store::create(mail));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
@@ -241,10 +241,10 @@ void MailTest::testMarkMailAsRead()
         .then<void, KAsync::Job<void>, QList<Mail::Ptr>>([this](const QList<Mail::Ptr> &mails) {
             ASYNCCOMPARE(mails.size(), 1);
             auto mail = mails.first();
-            mail->setUnread(true);
+            mail->setUnread(false);
             return Store::modify(*mail)
                 .then<void>(ResourceControl::flushReplayQueue(QByteArrayList() << mResourceInstanceIdentifier)) // The change needs to be replayed already
-                .then(ResourceControl::inspect<Mail>(ResourceControl::Inspection::PropertyInspection(*mail, Mail::Unread::name, true)))
+                .then(ResourceControl::inspect<Mail>(ResourceControl::Inspection::PropertyInspection(*mail, Mail::Unread::name, false)))
                 .then(ResourceControl::inspect<Mail>(ResourceControl::Inspection::PropertyInspection(*mail, Mail::Subject::name, mail->getSubject())));
         });
     VERIFYEXEC(job);
@@ -259,7 +259,7 @@ void MailTest::testMarkMailAsRead()
             ASYNCCOMPARE(mails.size(), 1);
             auto mail = mails.first();
             ASYNCVERIFY(!mail->getSubject().isEmpty());
-            ASYNCCOMPARE(mail->getUnread(), true);
+            ASYNCCOMPARE(mail->getUnread(), false);
             ASYNCVERIFY(QFileInfo(mail->getMimeMessagePath()).exists());
             return KAsync::null<void>();
         });