5 files changed, 59 insertions, 77 deletions

diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 0f7463f..221e20d 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -113,7 +113,7 @@ class DummySynchronizer : public Sink::Synchronizer {
     KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE
     {
         SinkLog() << " Synchronizing with the source";
-        return KAsync::start<void>([this]() {
+        return KAsync::syncStart<void>([this]() {
             synchronize(ENTITY_TYPE_EVENT, DummyStore::instance().events(), [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data) {
                 return createEvent(ridBuffer, data);
             });
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index e199ea1..f78376a 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -56,6 +56,8 @@
 
 SINK_DEBUG_AREA("imapresource")
 
+Q_DECLARE_METATYPE(QSharedPointer<Imap::ImapServerProxy>)
+
 using namespace Imap;
 using namespace Sink;
 
@@ -217,22 +219,22 @@ public:
         SinkLog() << "Synchronizing mails" << folder.normalizedPath();
         auto capabilities = imap->getCapabilities();
         bool canDoIncrementalRemovals = false;
-        return KAsync::start<void>([=]() {
+        return KAsync::syncStart<void>([=]() {
             //TODO update flags
         })
-        .then<void, KAsync::Job<void>>([=]() {
+        .then<void>([=]() {
             //TODO Remove what's no longer existing
             if (canDoIncrementalRemovals) {
             } else {
-                return imap->fetchUids(folder).then<void, QVector<qint64>>([this, folder](const QVector<qint64> &uids) {
+                return imap->fetchUids(folder).syncThen<void, QVector<qint64>>([this, folder](const QVector<qint64> &uids) {
                     SinkTrace() << "Syncing removals";
                     synchronizeRemovals(folder.normalizedPath(), uids.toList().toSet());
                     commit();
-                }).then<void>([](){});
+                });
             }
             return KAsync::null<void>();
         })
-        .then<void, KAsync::Job<void>>([this, folder, imap]() {
+        .then<void>([this, folder, imap]() {
             SinkTrace() << "About to fetch mail";
             const auto uidNext = syncStore().readValue(folder.normalizedPath().toUtf8() + "uidnext").toLongLong();
             auto maxUid = QSharedPointer<qint64>::create(0);
@@ -248,7 +250,7 @@ public:
             [](int progress, int total) {
                 SinkTrace() << "Progress: " << progress << " out of " << total;
             })
-            .then<void>([this, maxUid, folder]() {
+            .syncThen<void>([this, maxUid, folder]() {
                 syncStore().writeValue(folder.normalizedPath().toUtf8() + "uidnext", QByteArray::number(*maxUid));
             });
         });
@@ -330,15 +332,12 @@ public:
                 flags << Imap::Flags::Flagged;
             }
             QDateTime internalDate = mail.getDate();
-            auto rid = QSharedPointer<QByteArray>::create();
             return login.then(imap->append(mailbox, content, flags, internalDate))
-                .then<void, qint64>([imap, mailbox, rid, mail](qint64 uid) {
+                .addToContext(imap)
+                .syncThen<QByteArray, qint64>([mail](qint64 uid) {
                     const auto remoteId = assembleMailRid(mail, uid);
-                    //FIXME this get's called after the final error handler? WTF?
                     SinkTrace() << "Finished creating a new mail: " << remoteId;
-                    *rid = remoteId;
-                }).then<QByteArray>([rid, imap]() { //FIXME fix KJob so we don't need this extra clause
-                   return *rid;
+                    return remoteId;
                 });
         } else if (operation == Sink::Operation_Removal) {
             const auto folderId = folderIdFromMailRid(oldRemoteId);
@@ -348,7 +347,7 @@ public:
             KIMAP::ImapSet set;
             set.add(uid);
             return login.then(imap->remove(mailbox, set))
-                .then<QByteArray>([imap, oldRemoteId]() {
+                .syncThen<QByteArray>([imap, oldRemoteId] {
                     SinkTrace() << "Finished removing a mail: " << oldRemoteId;
                     return QByteArray();
                 });
@@ -374,29 +373,24 @@ public:
                 const QString oldMailbox = syncStore().resolveLocalId(ENTITY_TYPE_FOLDER, folderId);
                 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, mail](qint64 uid) {
+                    .addToContext(imap)
+                    .then<QByteArray, qint64>([=](qint64 uid) {
                         const auto remoteId = assembleMailRid(mail, uid);
                         SinkTrace() << "Finished creating a modified mail: " << remoteId;
-                        *rid = remoteId;
-                    })
-                    .then(imap->remove(oldMailbox, set))
-                    .then<QByteArray>([rid, imap]() {
-                        return *rid;
+                        return imap->remove(oldMailbox, set).then(KAsync::value(remoteId));
                     });
             } else {
                 SinkTrace() << "Updating flags only.";
                 KIMAP::ImapSet set;
                 set.add(uid);
                 return login.then(imap->select(mailbox))
+                    .addToContext(imap)
                     .then(imap->storeFlags(set, flags))
-                    .then<void>([imap, mailbox]() {
+                    .syncThen<QByteArray>([=] {
                         SinkTrace() << "Finished modifying mail";
-                    })
-                    .then<QByteArray>([oldRemoteId, imap]() {
                         return oldRemoteId;
                     });
             }
@@ -416,13 +410,13 @@ public:
             SinkTrace() << "Creating a new folder: " << parentFolder << folder.getName();
             auto rid = QSharedPointer<QByteArray>::create();
             auto createFolder = login.then<QString>(imap->createSubfolder(parentFolder, folder.getName()))
-                .then<void, QString>([imap, rid](const QString &createdFolder) {
+                .syncThen<void, QString>([imap, rid](const QString &createdFolder) {
                     SinkTrace() << "Finished creating a new folder: " << createdFolder;
                     *rid = createdFolder.toUtf8();
                 });
             if (folder.getSpecialPurpose().isEmpty()) {
                 return createFolder
-                    .then<QByteArray>([rid](){
+                    .syncThen<QByteArray>([rid](){
                         return *rid;
                     });
             } else { //We try to merge special purpose folders first
@@ -435,7 +429,7 @@ public:
                             };
                         }
                     }))
-                    .then<void, KAsync::Job<void>>([specialPurposeFolders, folder, imap, parentFolder, rid]() -> KAsync::Job<void> {
+                    .then<void>([specialPurposeFolders, folder, imap, parentFolder, rid]() -> KAsync::Job<void> {
                         for (const auto &purpose : folder.getSpecialPurpose()) {
                             if (specialPurposeFolders->contains(purpose)) {
                                 auto f = specialPurposeFolders->value(purpose);
@@ -446,13 +440,13 @@ public:
                         }
                         SinkTrace() << "No match found for merging, creating a new folder";
                         return imap->createSubfolder(parentFolder, folder.getName())
-                            .then<void, QString>([imap, rid](const QString &createdFolder) {
+                            .syncThen<void, QString>([imap, rid](const QString &createdFolder) {
                                 SinkTrace() << "Finished creating a new folder: " << createdFolder;
                                 *rid = createdFolder.toUtf8();
                             });
 
                     })
-                .then<QByteArray>([rid](){
+                .syncThen<QByteArray>([rid](){
                     return *rid;
                 });
                 return mergeJob;
@@ -460,7 +454,7 @@ public:
         } else if (operation == Sink::Operation_Removal) {
             SinkTrace() << "Removing a folder: " << oldRemoteId;
             return login.then<void>(imap->remove(oldRemoteId))
-                .then<QByteArray>([oldRemoteId, imap]() {
+                .syncThen<QByteArray>([oldRemoteId, imap]() {
                     SinkTrace() << "Finished removing a folder: " << oldRemoteId;
                     return QByteArray();
                 });
@@ -468,11 +462,11 @@ public:
             SinkTrace() << "Renaming a folder: " << oldRemoteId << folder.getName();
             auto rid = QSharedPointer<QByteArray>::create();
             return login.then<QString>(imap->renameSubfolder(oldRemoteId, folder.getName()))
-                .then<void, QString>([imap, rid](const QString &createdFolder) {
+                .syncThen<void, QString>([imap, rid](const QString &createdFolder) {
                     SinkTrace() << "Finished renaming a folder: " << createdFolder;
                     *rid = createdFolder.toUtf8();
                 })
-                .then<QByteArray>([rid](){
+                .syncThen<QByteArray>([rid](){
                     return *rid;
                 });
         }
@@ -566,7 +560,8 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
         SinkTrace() << "Connecting to:" << mServer << mPort;
         SinkTrace() << "as:" << mUser;
         auto inspectionJob = imap->login(mUser, mPassword)
-            .then<void>(imap->select(folderRemoteId).then<void>([](){}))
+            .then<Imap::SelectResult>(imap->select(folderRemoteId))
+            .syncThen<void, Imap::SelectResult>([](Imap::SelectResult){})
             .then<void>(imap->fetch(set, scope, [imap, messageByUid](const QVector<Imap::Message> &messages) {
                 for (const auto &m : messages) {
                     messageByUid->insert(m.uid, m);
@@ -575,7 +570,7 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
 
         if (inspectionType == Sink::ResourceControl::Inspection::PropertyInspectionType) {
             if (property == "unread") {
-                return inspectionJob.then<void, KAsync::Job<void>>([=]() {
+                return inspectionJob.then<void>([=]() {
                     auto msg = messageByUid->value(uid);
                     if (expectedValue.toBool() && msg.flags.contains(Imap::Flags::Seen)) {
                         return KAsync::error<void>(1, "Expected unread but couldn't find it.");
@@ -587,7 +582,7 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
                 });
             }
             if (property == "subject") {
-                return inspectionJob.then<void, KAsync::Job<void>>([=]() {
+                return inspectionJob.then<void>([=]() {
                     auto msg = messageByUid->value(uid);
                     if (msg.msg->subject(true)->asUnicodeString() != expectedValue.toString()) {
                         return KAsync::error<void>(1, "Subject not as expected: " + msg.msg->subject(true)->asUnicodeString());
@@ -597,7 +592,7 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
             }
         }
         if (inspectionType == Sink::ResourceControl::Inspection::ExistenceInspectionType) {
-            return inspectionJob.then<void, KAsync::Job<void>>([=]() {
+            return inspectionJob.then<void>([=]() {
                 if (!messageByUid->contains(uid)) {
                     SinkWarning() << "Existing messages are: " << messageByUid->keys();
                     SinkWarning() << "We're looking for: " << uid;
@@ -628,20 +623,19 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
             scope.mode = KIMAP::FetchJob::FetchScope::Headers;
             auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort);
             auto messageByUid = QSharedPointer<QHash<qint64, Imap::Message>>::create();
-            auto inspectionJob = imap->login(mUser, mPassword)
-                .then<void>(imap->select(remoteId).then<void>([](){}))
+            return imap->login(mUser, mPassword)
+                .then<void>(imap->select(remoteId).syncThen<void>([](){}))
                 .then<void>(imap->fetch(set, scope, [=](const QVector<Imap::Message> &messages) {
                     for (const auto &m : messages) {
                         messageByUid->insert(m.uid, m);
                     }
                 }))
-                .then<void, KAsync::Job<void>>([imap, messageByUid, expectedCount]() {
+                .then<void>([imap, messageByUid, expectedCount]() {
                     if (messageByUid->size() != expectedCount) {
                         return KAsync::error<void>(1, QString("Wrong number of messages on the server; found %1 instead of %2.").arg(messageByUid->size()).arg(expectedCount));
                     }
                     return KAsync::null<void>();
                 });
-            return inspectionJob;
         }
         if (inspectionType == Sink::ResourceControl::Inspection::ExistenceInspectionType) {
             auto  folderByPath = QSharedPointer<QSet<QString>>::create();
@@ -655,7 +649,7 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
                         *folderByName << f.pathParts.last();
                     }
                 }))
-                .then<void, KAsync::Job<void>>([this, folderByName, folderByPath, folder, remoteId, imap]() {
+                .then<void>([this, folderByName, folderByPath, folder, remoteId, imap]() {
                     if (!folderByName->contains(folder.getName())) {
                         SinkWarning() << "Existing folders are: " << *folderByPath;
                         SinkWarning() << "We're looking for: " << folder.getName();
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index a3d8d16..94367d8 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -161,7 +161,7 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
     auto namespaceJob = new KIMAP::NamespaceJob(mSession);
 
     //FIXME The ping is only required because the login job doesn't fail after the configured timeout
-    return ping().then(runJob(loginJob)).then(runJob(capabilitiesJob)).then<void>([this](){
+    return ping().then(runJob(loginJob)).then(runJob(capabilitiesJob)).syncThen<void>([this](){
         SinkTrace() << "Supported capabilities: " << mCapabilities;
         QStringList requiredExtensions = QStringList() << "UIDPLUS" << "NAMESPACE";
         for (const auto &requiredExtension : requiredExtensions) {
@@ -170,7 +170,7 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
                 //TODO fail the job
             }
         }
-    }).then(runJob(namespaceJob)).then<void>([this, namespaceJob](){
+    }).then(runJob(namespaceJob)).syncThen<void>([this, namespaceJob] {
         for (const auto &ns :namespaceJob->personalNamespaces()) {
             mPersonalNamespaces << ns.name;
             mPersonalNamespaceSeparator = ns.separator;
@@ -363,7 +363,7 @@ KAsync::Job<QList<qint64>> ImapServerProxy::fetchHeaders(const QString &mailbox,
                     list->append(uids.value(id));
                 }
             })
-    .then<QList<qint64>>([list](){
+    .syncThen<QList<qint64>>([list](){
         return *list;
     });
 }
@@ -402,35 +402,34 @@ KAsync::Job<void> ImapServerProxy::move(const QString &mailbox, const KIMAP::Ima
 
 KAsync::Job<QString> ImapServerProxy::createSubfolder(const QString &parentMailbox, const QString &folderName)
 {
-    auto folder = QSharedPointer<QString>::create();
-    return KAsync::start<void, KAsync::Job<void>>([this, parentMailbox, folderName, folder]() {
+    return KAsync::start<QString>([this, parentMailbox, folderName]() {
         Q_ASSERT(!mPersonalNamespaceSeparator.isNull());
+        auto folder = QSharedPointer<QString>::create();
         if (parentMailbox.isEmpty()) {
             *folder = mPersonalNamespaces.toList().first() + folderName;
         } else {
             *folder = parentMailbox + mPersonalNamespaceSeparator + folderName;
         }
         SinkTrace() << "Creating subfolder: " << *folder;
-        return create(*folder);
-    })
-    .then<QString>([=]() {
-        return *folder;
+        return create(*folder)
+            .syncThen<QString>([=]() {
+                return *folder;
+            });
     });
 }
 
 KAsync::Job<QString> ImapServerProxy::renameSubfolder(const QString &oldMailbox, const QString &newName)
 {
-    auto folder = QSharedPointer<QString>::create();
-    return KAsync::start<void, KAsync::Job<void>>([this, oldMailbox, newName, folder]() {
+    return KAsync::start<QString>([this, oldMailbox, newName] {
         Q_ASSERT(!mPersonalNamespaceSeparator.isNull());
         auto parts = oldMailbox.split(mPersonalNamespaceSeparator);
         parts.removeLast();
-        *folder = parts.join(mPersonalNamespaceSeparator) + mPersonalNamespaceSeparator + newName;
+        auto folder = QSharedPointer<QString>::create(parts.join(mPersonalNamespaceSeparator) + mPersonalNamespaceSeparator + newName);
         SinkTrace() << "Renaming subfolder: " << oldMailbox << *folder;
-        return rename(oldMailbox, *folder);
-    })
-    .then<QString>([=]() {
-        return *folder;
+        return rename(oldMailbox, *folder)
+            .syncThen<QString>([=]() {
+                return *folder;
+            });
     });
 }
 
@@ -461,7 +460,7 @@ KAsync::Job<void> ImapServerProxy::fetchMessages(const Folder &folder, qint64 ui
     auto time = QSharedPointer<QTime>::create();
     time->start();
     Q_ASSERT(!mPersonalNamespaceSeparator.isNull());
-    return select(mailboxFromFolder(folder)).then<void, KAsync::Job<void>, SelectResult>([this, callback, folder, time, progress, uidNext](const SelectResult &selectResult) -> KAsync::Job<void> {
+    return select(mailboxFromFolder(folder)).then<void, SelectResult>([this, callback, folder, time, progress, uidNext](const SelectResult &selectResult) -> KAsync::Job<void> {
 
         SinkLog() << "UIDNEXT " << selectResult.uidNext << uidNext;
         if (selectResult.uidNext == (uidNext + 1)) {
@@ -469,7 +468,7 @@ KAsync::Job<void> ImapServerProxy::fetchMessages(const Folder &folder, qint64 ui
             return KAsync::null<void>();
         }
 
-        return fetchHeaders(mailboxFromFolder(folder), (uidNext + 1)).then<void, KAsync::Job<void>, QList<qint64>>([this, callback, time, progress](const QList<qint64> &uidsToFetch){
+        return fetchHeaders(mailboxFromFolder(folder), (uidNext + 1)).then<void, QList<qint64>>([this, callback, time, progress](const QList<qint64> &uidsToFetch){
             SinkTrace() << "Fetched headers";
             SinkTrace() << "  Total: " << uidsToFetch.size();
             SinkTrace() << "  Uids to fetch: " << uidsToFetch;
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 392b422..e69d822 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -367,7 +367,7 @@ public:
     KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE
     {
         SinkLog() << " Synchronizing";
-        return KAsync::start<void, KAsync::Job<void> >([this]() {
+        return KAsync::start<void>([this]() {
             KPIM::Maildir maildir(mMaildirPath, true);
             if (!maildir.isValid(false)) {
                 return KAsync::error<void>(1, "Maildir path doesn't point to a valid maildir: " + mMaildirPath);
@@ -402,18 +402,14 @@ public:
         if (operation == Sink::Operation_Creation) {
             const auto remoteId = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
             SinkTrace() << "Mail created: " << remoteId;
-            return KAsync::start<QByteArray>([=]() -> QByteArray {
-                return remoteId.toUtf8();
-            });
+            return KAsync::value(remoteId.toUtf8());
         } else if (operation == Sink::Operation_Removal) {
             SinkTrace() << "Removing a mail: " << oldRemoteId;
             return KAsync::null<QByteArray>();
         } else if (operation == Sink::Operation_Modification) {
             SinkTrace() << "Modifying a mail: " << oldRemoteId;
             const auto remoteId = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
-            return KAsync::start<QByteArray>([=]() -> QByteArray {
-                return remoteId.toUtf8();
-            });
+            return KAsync::value(remoteId.toUtf8());
         }
         return KAsync::null<QByteArray>();
     }
@@ -427,9 +423,7 @@ public:
             SinkTrace() << "Creating a new folder: " << path;
             KPIM::Maildir maildir(path, false);
             maildir.create();
-            return KAsync::start<QByteArray>([=]() -> QByteArray {
-                return path.toUtf8();
-            });
+            return KAsync::value(path.toUtf8());
         } else if (operation == Sink::Operation_Removal) {
             const auto path = oldRemoteId;
             SinkTrace() << "Removing a folder: " << path;
@@ -438,9 +432,7 @@ public:
             return KAsync::null<QByteArray>();
         } else if (operation == Sink::Operation_Modification) {
             SinkWarning() << "Folder modifications are not implemented";
-            return KAsync::start<QByteArray>([=]() -> QByteArray {
-                return oldRemoteId;
-            });
+            return KAsync::value(oldRemoteId);
         }
         return KAsync::null<QByteArray>();
     }
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index a729d4d..be4e4e0 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -124,17 +124,14 @@ public:
             });
             auto job = KAsync::null<void>();
             for (const auto &m : toSend) {
-                job = job.then(send(m, mSettings)).then<void>([this, m]() {
+                job = job.then(send(m, mSettings)).syncThen<void>([this, m] {
                     auto modifiedMail = ApplicationDomain::Mail(mResourceInstanceIdentifier, m.identifier(), m.revision(), QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
                     modifiedMail.setSent(true);
                     modify(modifiedMail);
                     //TODO copy to a sent mail folder as well
                 });
             }
-            job = job.then<void>([&future]() {
-                future.setFinished();
-            },
-            [&future](int errorCode, const QString &errorString) {
+            job = job.syncThen<void>([&future](const KAsync::Error &) {
                 future.setFinished();
             });
             job.exec();