1 files changed, 24 insertions, 2 deletions

diff --git a/common/synchronizer.h b/common/synchronizer.h
index 120a8a5..b1ee122 100644
--- a/common/synchronizer.h
+++ b/common/synchronizer.h
@@ -21,6 +21,7 @@
 
 #include "sink_export.h"
 #include <QObject>
+#include <QStack>
 #include <KAsync/Async>
 #include <domainadaptor.h>
 #include <query.h>
@@ -73,9 +74,9 @@ protected:
 protected:
     ///Implement to write back changes to the server
     virtual KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Contact &, Sink::Operation, const QByteArray &oldRemoteId, const QList<QByteArray> &);
+    virtual KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Addressbook &, Sink::Operation, const QByteArray &oldRemoteId, const QList<QByteArray> &);
     virtual KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Mail &, Sink::Operation, const QByteArray &oldRemoteId, const QList<QByteArray> &);
     virtual KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Folder &, Sink::Operation, const QByteArray &oldRemoteId, const QList<QByteArray> &);
-
 protected:
     ///Calls the callback to enqueue the command
     void enqueueCommand(int commandId, const QByteArray &data);
@@ -134,7 +135,8 @@ protected:
             : requestId(requestId_),
             requestType(Synchronization),
             options(o),
-            query(q)
+            query(q),
+            applicableEntities(q.ids())
         {
         }
 
@@ -155,6 +157,7 @@ protected:
         RequestType requestType;
         RequestOptions options = NoOptions;
         Sink::QueryBase query;
+        QByteArrayList applicableEntities;
     };
 
     /**
@@ -175,9 +178,28 @@ protected:
      */
     virtual QList<Synchronizer::SyncRequest> getSyncRequests(const Sink::QueryBase &query);
 
+    /**
+     * This allows the synchronizer to merge new requests with existing requests in the queue.
+     */
+    virtual void mergeIntoQueue(const Synchronizer::SyncRequest &request, QList<Synchronizer::SyncRequest> &queue);
+
+    void emitNotification(Notification::NoticationType type, int code, const QString &message, const QByteArray &id = QByteArray{}, const QByteArrayList &entiteis = QByteArrayList{});
+
+    /**
+     * Report progress for current task
+     */
+    void reportProgress(int progress, int total);
+
 protected:
     Sink::Log::Context mLogCtx;
+
 private:
+    QStack<ApplicationDomain::Status> mCurrentState;
+    void setStatusFromResult(const KAsync::Error &error, const QString &s, const QByteArray &requestId);
+    void setStatus(ApplicationDomain::Status busy, const QString &reason, const QByteArray requestId);
+    void resetStatus(const QByteArray requestId);
+    void setBusy(bool busy, const QString &reason, const QByteArray requestId);
+
     void modifyIfChanged(Storage::EntityStore &store, const QByteArray &bufferType, const QByteArray &sinkId, const Sink::ApplicationDomain::ApplicationDomainType &entity);
     KAsync::Job<void> processRequest(const SyncRequest &request);
     KAsync::Job<void> processSyncQueue();