4 files changed, 10 insertions, 4 deletions

diff --git a/common/changereplay.h b/common/changereplay.h
index a568060..42736ca 100644
--- a/common/changereplay.h
+++ b/common/changereplay.h
@@ -59,8 +59,8 @@ private:
 
 class NullChangeReplay : public ChangeReplay
 {
-    public:
-    NullChangeReplay() : ChangeReplay("null") {}
+public:
+    NullChangeReplay(const QByteArray &resourceName) : ChangeReplay(resourceName) {}
     KAsync::Job<void> replay(const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE { return KAsync::null<void>(); }
 };
 
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 674aca7..a443581 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -129,7 +129,7 @@ DummyResource::DummyResource(const QByteArray &instanceIdentifier, const QShared
     : Sink::GenericResource(PLUGIN_NAME, instanceIdentifier, pipeline)
 {
     setupSynchronizer(QSharedPointer<DummySynchronizer>::create(PLUGIN_NAME, instanceIdentifier));
-    setupChangereplay(QSharedPointer<Sink::NullChangeReplay>::create());
+    setupChangereplay(QSharedPointer<Sink::NullChangeReplay>::create(instanceIdentifier));
     setupPreprocessors(ENTITY_TYPE_MAIL,
             QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Mail>);
     setupPreprocessors(ENTITY_TYPE_FOLDER,
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 72cc058..e725872 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -152,6 +152,9 @@ public:
                 // auto remoteIds = synchronizationTransaction.openDatabase("rid.mapping." + bufferType, std::function<void(const Sink::Storage::Error &)>(), true);
                 auto mainDatabase = Sink::Storage::mainDatabase(transaction(), bufferType);
                 mainDatabase.scan("", [&](const QByteArray &key, const QByteArray &) {
+                    if (Sink::Storage::isInternalKey(key)) {
+                        return true;
+                    }
                     callback(key);
                     return true;
                 });
@@ -364,7 +367,7 @@ ImapResource::ImapResource(const QByteArray &instanceIdentifier, const QSharedPo
     synchronizer->mPassword = mPassword;
     synchronizer->mResourceInstanceIdentifier = instanceIdentifier;
     setupSynchronizer(synchronizer);
-    auto changereplay = QSharedPointer<Sink::NullChangeReplay>::create();
+    auto changereplay = QSharedPointer<Sink::NullChangeReplay>::create(instanceIdentifier);
     // auto changereplay = QSharedPointer<ImapWriteback>::create(PLUGIN_NAME, instanceIdentifier);
     // changereplay->mServer = mServer;
     // changereplay->mPort = mPort;
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index eb35d39..67a2b43 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -289,6 +289,9 @@ public:
                 // auto remoteIds = synchronizationTransaction.openDatabase("rid.mapping." + bufferType, std::function<void(const Sink::Storage::Error &)>(), true);
                 auto mainDatabase = Sink::Storage::mainDatabase(transaction(), bufferType);
                 mainDatabase.scan("", [&](const QByteArray &key, const QByteArray &) {
+                    if (Sink::Storage::isInternalKey(key)) {
+                        return true;
+                    }
                     callback(key);
                     return true;
                 });