Folded the SourceWriteback into the Synchronizer.

By concentrating all communication to the source in one place we get rid
of several oddities.
* Quite a bit of duplication since both need access to the
  synchronizationStore and the source.
* We currently have an akward locking in place because both classes
  access the ync store. This is not easier to resolve cleanly.
* The live of resource implementers becomes easier.
* An implementation could elect to not use changereplay and always do a
  full sync... (maybe?)

1 files changed, 14 insertions, 1 deletions

diff --git a/common/synchronizer.h b/common/synchronizer.h
index 47518ee..0a51f54 100644
--- a/common/synchronizer.h
+++ b/common/synchronizer.h
@@ -27,6 +27,8 @@
 #include <messagequeue.h>
 #include <storage.h>
 #include <storage/entitystore.h>
+#include "changereplay.h"
+#include "remoteidmap.h"
 
 namespace Sink {
 class RemoteIdMap;
@@ -34,8 +36,9 @@ class RemoteIdMap;
 /**
  * Synchronize and add what we don't already have to local queue
  */
-class SINK_EXPORT Synchronizer
+class SINK_EXPORT Synchronizer : public ChangeReplay
 {
+    Q_OBJECT
 public:
     Synchronizer(const Sink::ResourceContext &resourceContext);
     virtual ~Synchronizer();
@@ -53,6 +56,16 @@ public:
     Sink::Storage::DataStore::Transaction &syncTransaction();
 
 protected:
+    ///Base implementation calls the replay$Type calls
+    virtual KAsync::Job<void> replay(const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE;
+    virtual bool canReplay(const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE;
+
+protected:
+    ///Implement to write back changes to the server
+    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);