Simplification

1 files changed, 20 insertions, 24 deletions

diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index a4622f3..a49d62b 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -81,12 +81,28 @@ public:
                 return KAsync::error<void>(1, "Failed to send the message.");
             }
         }
-        return KAsync::null<void>();
+        return KAsync::start<void>([=] {
+            SinkLog() << "Sent mail, and triggering move to sent mail folder: " << mail.identifier();
+            auto modifiedMail = ApplicationDomain::Mail(mResourceInstanceIdentifier, mail.identifier(), mail.revision(), QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+            modifiedMail.setSent(true);
+
+            auto resource = Store::readOne<ApplicationDomain::SinkResource>(Query{}.filter(mResourceInstanceIdentifier).request<ApplicationDomain::SinkResource::Account>());
+            //Then copy the mail to the target resource
+            Query query;
+            query.containsFilter<ApplicationDomain::SinkResource::Capabilities>(ApplicationDomain::ResourceCapabilities::Mail::sent);
+            query.filter<ApplicationDomain::SinkResource::Account>(resource.getAccount());
+            return Store::fetchOne<ApplicationDomain::SinkResource>(query)
+                .then([this, modifiedMail](const ApplicationDomain::SinkResource &resource) {
+                    //First modify the mail to have the sent property set to true
+                    modify(modifiedMail, resource.identifier(), true);
+                    return KAsync::null<void>();
+                });
+        });
     }
 
     KAsync::Job<void> synchronizeWithSource(const Sink::QueryBase &query) Q_DECL_OVERRIDE
     {
-        return KAsync::start<void>([this](KAsync::Future<void> future) {
+        return KAsync::start<void>([this]() {
             QList<ApplicationDomain::Mail> toSend;
             SinkLog() << "Looking for mails to send.";
             store().readAll<ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) -> bool {
@@ -99,29 +115,9 @@ public:
             SinkLog() << "Found " << toSend.size() << " mails to send";
             auto job = KAsync::null<void>();
             for (const auto &m : toSend) {
-                job = job.then(send(m, mSettings))
-                         .then<void>([this, m] {
-                    SinkLog() << "Sent mail, and triggering move to sent mail folder: " << m.identifier();
-                    auto modifiedMail = ApplicationDomain::Mail(mResourceInstanceIdentifier, m.identifier(), m.revision(), QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
-                    modifiedMail.setSent(true);
-
-                    auto resource = Store::readOne<ApplicationDomain::SinkResource>(Query{}.filter(mResourceInstanceIdentifier).request<ApplicationDomain::SinkResource::Account>());
-                    //Then copy the mail to the target resource
-                    Query query;
-                    query.containsFilter<ApplicationDomain::SinkResource::Capabilities>(ApplicationDomain::ResourceCapabilities::Mail::sent);
-                    query.filter<ApplicationDomain::SinkResource::Account>(resource.getAccount());
-                    return Store::fetchOne<ApplicationDomain::SinkResource>(query)
-                        .then<void, ApplicationDomain::SinkResource>([this, modifiedMail](const ApplicationDomain::SinkResource &resource) -> KAsync::Job<void> {
-                            //First modify the mail to have the sent property set to true
-                            modify(modifiedMail, resource.identifier(), true);
-                            return KAsync::null<void>();
-                        });
-                });
+                job = job.then(send(m, mSettings));
             }
-            job = job.then([&future](const KAsync::Error &) {
-                future.setFinished();
-            });
-            job.exec();
+            return job;
         });
     }