3 files changed, 20 insertions, 11 deletions

diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
index 13c174b..b7ba2c2 100644
--- a/dummyresource/facade.cpp
+++ b/dummyresource/facade.cpp
@@ -118,22 +118,29 @@ static std::function<bool(const std::string &key, DummyEvent const *buffer)> pre
     return preparedQuery;
 }
 
-void DummyResourceFacade::synchronizeResource(const std::function<void()> &continuation)
+Async::Job<void> DummyResourceFacade::synchronizeResource(bool sync)
 {
     //TODO check if a sync is necessary
     //TODO Only sync what was requested
     //TODO timeout
-    mResourceAccess->synchronizeResource().then<void>([continuation](Async::Future<void> &f){
-        continuation();
-        f.setFinished();
-    }).exec();
+
+    if (sync) {
+        return Async::start<void>([=](Async::Future<void> &future) {
+            mResourceAccess->open();
+            mResourceAccess->synchronizeResource().then<void>([&future](Async::Future<void> &f) {
+                future.setFinished();
+                f.setFinished();
+            }).exec();
+        });
+    }
+    return Async::null<void>();
 }
 
-void DummyResourceFacade::load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::Domain::Event::Ptr &)> &resultCallback, const std::function<void()> &completeCallback)
+Async::Job<void> DummyResourceFacade::load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::Domain::Event::Ptr &)> &resultCallback)
 {
     qDebug() << "load called";
 
-    synchronizeResource([=]() {
+    return synchronizeResource(query.syncOnDemand).then<void>([=](Async::Future<void> &future) {
         qDebug() << "sync complete";
         //Now that the sync is complete we can execute the query
         const auto preparedQuery = prepareQuery(query);
@@ -188,7 +195,7 @@ void DummyResourceFacade::load(const Akonadi2::Query &query, const std::function
             }
             return true;
         });
-        completeCallback();
+        future.setFinished();
     });
 }
 
diff --git a/dummyresource/facade.h b/dummyresource/facade.h
index 9c8827a..da0b1d6 100644
--- a/dummyresource/facade.h
+++ b/dummyresource/facade.h
@@ -40,10 +40,10 @@ public:
     virtual Async::Job<void> create(const Akonadi2::Domain::Event &domainObject);
     virtual Async::Job<void> modify(const Akonadi2::Domain::Event &domainObject);
     virtual Async::Job<void> remove(const Akonadi2::Domain::Event &domainObject);
-    virtual void load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::Domain::Event::Ptr &)> &resultCallback, const std::function<void()> &completeCallback);
+    virtual Async::Job<void> load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::Domain::Event::Ptr &)> &resultCallback);
 
 private:
-    void synchronizeResource(const std::function<void()> &continuation);
+    Async::Job<void> synchronizeResource(bool sync);
     QSharedPointer<Akonadi2::ResourceAccess> mResourceAccess;
     QSharedPointer<DomainTypeAdaptorFactory<Akonadi2::Domain::Event, Akonadi2::Domain::Buffer::Event, DummyCalendar::DummyEvent> > mFactory;
 };
diff --git a/dummyresource/resourcefactory.cpp b/dummyresource/resourcefactory.cpp
index f74eb72..dc716ef 100644
--- a/dummyresource/resourcefactory.cpp
+++ b/dummyresource/resourcefactory.cpp
@@ -317,7 +317,9 @@ Async::Job<void> DummyResource::synchronizeWithSource(Akonadi2::Pipeline *pipeli
                 builder.add_attachment(attachment);
                 auto buffer = builder.Finish();
                 DummyCalendar::FinishDummyEventBuffer(m_fbb, buffer);
-                enqueueCommand(mSynchronizerQueue, Akonadi2::Commands::CreateEntityCommand, QByteArray::fromRawData(reinterpret_cast<char const *>(m_fbb.GetBufferPointer()), m_fbb.GetSize()));
+                flatbuffers::FlatBufferBuilder entityFbb;
+                Akonadi2::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, m_fbb.GetBufferPointer(), m_fbb.GetSize(), 0, 0);
+                enqueueCommand(mSynchronizerQueue, Akonadi2::Commands::CreateEntityCommand, QByteArray::fromRawData(reinterpret_cast<char const *>(entityFbb.GetBufferPointer()), entityFbb.GetSize()));
             } else { //modification
                 //TODO diff and create modification if necessary
             }