From 672bbe1f10be056c1170bc227e16060edeff2481 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 3 Jun 2016 11:26:08 +0200
Subject: Implemented imap flag changes.

---
 examples/imapresource/imapresource.cpp    | 45 ++++++++++++++++++++-----------
 examples/imapresource/imapserverproxy.cpp | 24 +++++++++++++++++
 examples/imapresource/imapserverproxy.h   |  3 +++
 3 files changed, 57 insertions(+), 15 deletions(-)

(limited to 'examples/imapresource')

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);
-- 
cgit v1.2.3