From 3e786efb2811f1e88485ffff50d1327d07f40892 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 29 Dec 2014 19:56:23 +0100
Subject: Turned synchronizeResource command into a job.

---
 common/resourceaccess.cpp | 8 ++++++--
 common/resourceaccess.h   | 3 ++-
 dummyresource/facade.cpp  | 6 ++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 31b9e79..9fb0d4c 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -161,9 +161,13 @@ void ResourceAccess::sendCommand(int commandId, flatbuffers::FlatBufferBuilder &
     }
 }
 
-void ResourceAccess::synchronizeResource(const std::function<void()> &resultHandler)
+Async::Job<void> ResourceAccess::synchronizeResource()
 {
-    sendCommand(Commands::SynchronizeCommand, resultHandler);
+    return Async::start<void>([this](Async::Future<void> &f) {
+        sendCommand(Commands::SynchronizeCommand, [&f]() {
+            f.setFinished();
+        });
+    });
 }
 
 void ResourceAccess::open()
diff --git a/common/resourceaccess.h b/common/resourceaccess.h
index d79c993..d45ebde 100644
--- a/common/resourceaccess.h
+++ b/common/resourceaccess.h
@@ -25,6 +25,7 @@
 #include <QTimer>
 
 #include <flatbuffers/flatbuffers.h>
+#include <async/src/async.h>
 
 namespace Akonadi2
 {
@@ -43,7 +44,7 @@ public:
     //TODO use jobs
     void sendCommand(int commandId, const std::function<void()> &callback = std::function<void()>());
     void sendCommand(int commandId, flatbuffers::FlatBufferBuilder &fbb, const std::function<void()> &callback);
-    void synchronizeResource(const std::function<void()> &resultHandler);
+    Async::Job<void> synchronizeResource();
 
 public Q_SLOTS:
     void open();
diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
index b4d98c6..5320216 100644
--- a/dummyresource/facade.cpp
+++ b/dummyresource/facade.cpp
@@ -95,8 +95,10 @@ void DummyResourceFacade::synchronizeResource(const std::function<void()> &conti
     //TODO check if a sync is necessary
     //TODO Only sync what was requested
     //TODO timeout
-    mResourceAccess->open();
-    mResourceAccess->synchronizeResource(continuation);
+    mResourceAccess->synchronizeResource().then<void>([continuation](Async::Future<void> &f){
+        continuation();
+        f.setFinished();
+    }).exec();
 }
 
 void DummyResourceFacade::load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::Domain::Event::Ptr &)> &resultCallback, const std::function<void()> &completeCallback)
-- 
cgit v1.2.3