1 files changed, 57 insertions, 10 deletions

diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index 88a90c6..8a4ef92 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -30,7 +30,6 @@
 #include <KMime/Message>
 
 #include "mailtransport.h"
-#include "mail_generated.h"
 #include "inspection.h"
 #include <synchronizer.h>
 #include <log.h>
@@ -44,6 +43,47 @@ SINK_DEBUG_AREA("mailtransportresource")
 
 using namespace Sink;
 
+class MailtransportPreprocessor : public Sink::Preprocessor
+{
+public:
+    MailtransportPreprocessor() : Sink::Preprocessor() {}
+
+    QByteArray getTargetResource()
+    {
+        using namespace Sink::ApplicationDomain;
+
+        auto resource = Store::readOne<ApplicationDomain::SinkResource>(Query{}.filter(resourceInstanceIdentifier()).request<ApplicationDomain::SinkResource::Account>());
+        if (resource.identifier().isEmpty()) {
+            SinkWarning() << "Failed to retrieve this resource: " << resourceInstanceIdentifier();
+        }
+        Query query;
+        query.containsFilter<ApplicationDomain::SinkResource::Capabilities>(ApplicationDomain::ResourceCapabilities::Mail::sent);
+        query.filter<ApplicationDomain::SinkResource::Account>(resource.getAccount());
+        auto targetResource = Store::readOne<ApplicationDomain::SinkResource>(query);
+        if (targetResource.identifier().isEmpty()) {
+            SinkWarning() << "Failed to find target resource: " << targetResource.identifier();
+        }
+        return targetResource.identifier();
+    }
+
+    virtual Result processModification(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff) Q_DECL_OVERRIDE
+    {
+        if (type == Preprocessor::Modification) {
+            using namespace Sink::ApplicationDomain;
+            if (diff.changedProperties().contains(Mail::Trash::name)) {
+                //Move back to regular resource
+                diff.setResource(getTargetResource());
+                return {MoveToResource};
+            } else if (diff.changedProperties().contains(Mail::Draft::name)) {
+                //Move back to regular resource
+                diff.setResource(getTargetResource());
+                return {MoveToResource};
+            }
+        }
+        return {NoAction};
+    }
+};
+
 class MailtransportSynchronizer : public Sink::Synchronizer {
 public:
     MailtransportSynchronizer(const Sink::ResourceContext &resourceContext)
@@ -55,17 +95,22 @@ public:
 
     KAsync::Job<void> send(const ApplicationDomain::Mail &mail, const MailtransportResource::Settings &settings)
     {
-        return KAsync::start<void>([=] {
+        return KAsync::start([=] {
             if (!syncStore().readValue(mail.identifier()).isEmpty()) {
                 SinkLog() << "Mail is already sent: " << mail.identifier();
                 return KAsync::null();
             }
+            emitNotification(Notification::Info, ApplicationDomain::SyncInProgress, "Sending message.", {}, {mail.identifier()});
             const auto data = mail.getMimeMessage();
             auto msg = KMime::Message::Ptr::create();
             msg->setHead(KMime::CRLFtoLF(data));
             msg->parse();
             if (settings.testMode) {
-                SinkLog() << "I would totally send that mail, but I'm in test mode." << mail.identifier();
+                auto subject = msg->subject(true)->asUnicodeString();
+                SinkLog() << "I would totally send that mail, but I'm in test mode." << mail.identifier() << subject;
+                if (!subject.contains("send")) {
+                    return KAsync::error("Failed to send the message.");
+                }
                 auto path = resourceStorageLocation(mResourceInstanceIdentifier) + "/test/";
                 SinkTrace() << path;
                 QDir dir;
@@ -77,11 +122,16 @@ public:
             } else {
                 MailTransport::Options options;
                 if (settings.server.contains("smtps")) {
-                    options &= MailTransport::UseTls;
+                    options |= MailTransport::UseTls;
                 }
                 if (!MailTransport::sendMessage(msg, settings.server.toUtf8(), settings.username.toUtf8(), settings.password.toUtf8(), settings.cacert.toUtf8(), options)) {
                     SinkWarning() << "Failed to send message: " << mail;
+                    emitNotification(Notification::Warning, ApplicationDomain::SyncError, "Failed to send message.", {}, {mail.identifier()});
+                    emitNotification(Notification::Warning, ApplicationDomain::TransmissionError, "Failed to send message.", {}, {mail.identifier()});
                     return KAsync::error("Failed to send the message.");
+                } else {
+                    emitNotification(Notification::Info, ApplicationDomain::SyncSuccess, "Message successfully sent.", {}, {mail.identifier()});
+                    emitNotification(Notification::Info, ApplicationDomain::TransmissionSuccess, "Message successfully sent.", {}, {mail.identifier()});
                 }
             }
             syncStore().writeValue(mail.identifier(), "sent");
@@ -100,9 +150,8 @@ public:
             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 the mail to have the sent property set to true, and move it to the new resource.
                     modify(modifiedMail, resource.identifier(), true);
-                    return KAsync::null<void>();
                 });
         });
     }
@@ -112,12 +161,10 @@ public:
         return KAsync::start<void>([this]() {
             QList<ApplicationDomain::Mail> toSend;
             SinkLog() << "Looking for mails to send.";
-            store().readAll<ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) -> bool {
-                SinkTrace() << "Found mail: " << mail.identifier();
+            store().readAll<ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) {
                 if (!mail.getSent()) {
                     toSend << mail;
                 }
-                return true;
             });
             SinkLog() << "Found " << toSend.size() << " mails to send";
             auto job = KAsync::null<void>();
@@ -192,7 +239,7 @@ MailtransportResource::MailtransportResource(const Sink::ResourceContext &resour
     setupSynchronizer(synchronizer);
     setupInspector(QSharedPointer<MailtransportInspector>::create(resourceContext));
 
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new MailPropertyExtractor);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new MailPropertyExtractor << new MailtransportPreprocessor);
 }
 
 MailtransportResourceFactory::MailtransportResourceFactory(QObject *parent)