3 files changed, 9 insertions, 5 deletions

diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 87b6da1..d43eff7 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -323,7 +323,7 @@ void GenericResource::setupSynchronizer(const QSharedPointer<Synchronizer> &sync
     mSynchronizer = synchronizer;
     mSynchronizer->setup([this](int commandId, const QByteArray &data) {
         enqueueCommand(mSynchronizerQueue, commandId, data);
-    });
+    }, mSynchronizerQueue);
 }
 
 void GenericResource::setupChangereplay(const QSharedPointer<ChangeReplay> &changeReplay)
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index ee7a7ba..cf50b0b 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -45,9 +45,10 @@ Synchronizer::~Synchronizer()
 
 }
 
-void Synchronizer::setup(const std::function<void(int commandId, const QByteArray &data)> &enqueueCommandCallback)
+void Synchronizer::setup(const std::function<void(int commandId, const QByteArray &data)> &enqueueCommandCallback, MessageQueue &mq)
 {
     mEnqueue = enqueueCommandCallback;
+    mMessageQueue = &mq;
 }
 
 void Synchronizer::enqueueCommand(int commandId, const QByteArray &data)
@@ -239,9 +240,11 @@ void Synchronizer::modify(const DomainType &entity)
 KAsync::Job<void> Synchronizer::synchronize()
 {
     Trace() << "Synchronizing";
+    mMessageQueue->startTransaction();
     return synchronizeWithSource().then<void>([this]() {
         mSyncStore.clear();
         mEntityStore.clear();
+        mMessageQueue->commit();
     });
 }
 
diff --git a/common/synchronizer.h b/common/synchronizer.h
index 6f98f35..9c0e2e2 100644
--- a/common/synchronizer.h
+++ b/common/synchronizer.h
@@ -24,8 +24,8 @@
 #include <Async/Async>
 #include <domainadaptor.h>
 #include <query.h>
-
-#include "storage.h"
+#include <messagequeue.h>
+#include <storage.h>
 
 namespace Sink {
 class EntityStore;
@@ -40,7 +40,7 @@ public:
     Synchronizer(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier);
     virtual ~Synchronizer();
 
-    void setup(const std::function<void(int commandId, const QByteArray &data)> &enqueueCommandCallback);
+    void setup(const std::function<void(int commandId, const QByteArray &data)> &enqueueCommandCallback, MessageQueue &messageQueue);
     KAsync::Job<void> synchronize();
 
     //Read only access to main storage
@@ -105,6 +105,7 @@ private:
     Sink::Storage::Transaction mTransaction;
     Sink::Storage::Transaction mSyncTransaction;
     std::function<void(int commandId, const QByteArray &data)> mEnqueue;
+    MessageQueue *mMessageQueue;
 };
 
 }