Introduced flushMessageQueue

to get rid of the processAll/sync flags in the query object

2 files changed, 23 insertions, 2 deletions

diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index 2c25220..ffaa57b 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -212,6 +212,22 @@ KAsync::Job<void> Store::synchronize(const Akonadi2::Query &query)
     .template then<void>([](){});
 }
 
+KAsync::Job<void> Store::flushMessageQueue(const QByteArrayList &resourceIdentifier)
+{
+    Trace() << "flushMessageQueue" << resourceIdentifier;
+    return KAsync::iterate(resourceIdentifier)
+    .template each<void, QByteArray>([](const QByteArray &resource, KAsync::Future<void> &future) {
+        Trace() << "Flushing message queue " << resource;
+        auto resourceAccess = QSharedPointer<Akonadi2::ResourceAccess>::create(resource);
+        resourceAccess->open();
+        resourceAccess->synchronizeResource(false, true).then<void>([&future, resourceAccess]() {
+            future.setFinished();
+        }).exec();
+    })
+    //FIXME JOBAPI this is only required because we don't care about the return value of each (and each shouldn't even have a return value)
+    .template then<void>([](){});
+}
+
 template <class DomainType>
 KAsync::Job<DomainType> Store::fetchOne(const Akonadi2::Query &query)
 {
diff --git a/common/clientapi.h b/common/clientapi.h
index f1c3bc6..eff8e8d 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -73,6 +73,11 @@ public:
     static KAsync::Job<void> remove(const DomainType &domainObject);
 
     /**
+     * Synchronize data to local cache.
+     */
+    static KAsync::Job<void> synchronize(const Akonadi2::Query &query);
+
+    /**
      * Shutdown resource.
      */
     static KAsync::Job<void> shutdown(const QByteArray &resourceIdentifier);
@@ -87,9 +92,9 @@ public:
     static KAsync::Job<void> start(const QByteArray &resourceIdentifier);
 
     /**
-     * Synchronize data to local cache.
+     * Flushes any pending messages to disk
      */
-    static KAsync::Job<void> synchronize(const Akonadi2::Query &query);
+    static KAsync::Job<void> flushMessageQueue(const QByteArrayList &resourceIdentifier);
 
     /**
      * Removes a resource from disk.