3 files changed, 31 insertions, 20 deletions

diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index 15a06e7..8de45a9 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -143,36 +143,45 @@ void Synchronizer::scanForRemovals(const QByteArray &bufferType, const std::func
     });
 }
 
+void Synchronizer::modify(const QByteArray &bufferType, const QByteArray &remoteId, const Sink::ApplicationDomain::ApplicationDomainType &entity)
+{
+    auto mainDatabase = Storage::mainDatabase(transaction(), bufferType);
+    const auto sinkId = syncStore().resolveRemoteId(bufferType, remoteId);
+    auto adaptorFactory = Sink::AdaptorFactoryRegistry::instance().getFactory(mResourceType, bufferType);
+    Q_ASSERT(adaptorFactory);
+    qint64 retrievedRevision = 0;
+    if (auto current = EntityReaderUtils::getLatest(mainDatabase, sinkId, *adaptorFactory, retrievedRevision)) {
+        bool changed = false;
+        for (const auto &property : entity.changedProperties()) {
+            if (entity.getProperty(property) != current->getProperty(property)) {
+                SinkTrace() << "Property changed " << sinkId << property;
+                changed = true;
+            }
+        }
+        if (changed) {
+            SinkTrace() << "Found a modified entity: " << remoteId;
+            modifyEntity(sinkId, Sink::Storage::maxRevision(transaction()), bufferType, entity, *adaptorFactory,
+                [this](const QByteArray &buffer) { enqueueCommand(Sink::Commands::ModifyEntityCommand, buffer); });
+        }
+    } else {
+        SinkWarning() << "Failed to get current entity";
+    }
+}
+
 void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray &remoteId, const Sink::ApplicationDomain::ApplicationDomainType &entity)
 {
     SinkTrace() << "Create or modify" << bufferType << remoteId;
     auto mainDatabase = Storage::mainDatabase(transaction(), bufferType);
     const auto sinkId = syncStore().resolveRemoteId(bufferType, remoteId);
     const auto found = mainDatabase.contains(sinkId);
-    auto adaptorFactory = Sink::AdaptorFactoryRegistry::instance().getFactory(mResourceType, bufferType);
-    Q_ASSERT(adaptorFactory);
     if (!found) {
         SinkTrace() << "Found a new entity: " << remoteId;
+        auto adaptorFactory = Sink::AdaptorFactoryRegistry::instance().getFactory(mResourceType, bufferType);
+        Q_ASSERT(adaptorFactory);
         createEntity(
             sinkId, bufferType, entity, *adaptorFactory, [this](const QByteArray &buffer) { enqueueCommand(Sink::Commands::CreateEntityCommand, buffer); });
     } else { // modification
-        qint64 retrievedRevision = 0;
-        if (auto current = EntityReaderUtils::getLatest(mainDatabase, sinkId, *adaptorFactory, retrievedRevision)) {
-            bool changed = false;
-            for (const auto &property : entity.changedProperties()) {
-                if (entity.getProperty(property) != current->getProperty(property)) {
-                    SinkTrace() << "Property changed " << sinkId << property;
-                    changed = true;
-                }
-            }
-            if (changed) {
-                SinkTrace() << "Found a modified entity: " << remoteId;
-                modifyEntity(sinkId, Sink::Storage::maxRevision(transaction()), bufferType, entity, *adaptorFactory,
-                    [this](const QByteArray &buffer) { enqueueCommand(Sink::Commands::ModifyEntityCommand, buffer); });
-            }
-        } else {
-            SinkWarning() << "Failed to get current entity";
-        }
+        modify(bufferType, remoteId, entity);
     }
 }
 
diff --git a/common/synchronizer.h b/common/synchronizer.h
index 81d4f27..5f60128 100644
--- a/common/synchronizer.h
+++ b/common/synchronizer.h
@@ -84,6 +84,7 @@ protected:
     void createOrModify(const QByteArray &bufferType, const QByteArray &remoteId, const Sink::ApplicationDomain::ApplicationDomainType &entity);
     template <typename DomainType>
     void createOrModify(const QByteArray &bufferType, const QByteArray &remoteId, const DomainType &entity, const QHash<QByteArray, Sink::Query::Comparator> &mergeCriteria);
+    void modify(const QByteArray &bufferType, const QByteArray &remoteId, const Sink::ApplicationDomain::ApplicationDomainType &entity);
 
     // template <typename DomainType>
     // void create(const DomainType &entity);
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 3a7be2d..0b1437a 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -233,7 +233,8 @@ public:
                     auto mail = Sink::ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
                     mail.setUnread(!message.flags.contains(Imap::Flags::Seen));
                     mail.setImportant(message.flags.contains(Imap::Flags::Flagged));
-                    createOrModify(ENTITY_TYPE_MAIL, remoteId, mail);
+
+                    modify(ENTITY_TYPE_MAIL, remoteId, mail);
                 }
             });
         })