Ensure we always process the full queue and that flushing works.

1 files changed, 14 insertions, 1 deletions

diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index 8010689..5bde597 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -287,11 +287,15 @@ KAsync::Job<void> Synchronizer::processSyncQueue()
         mSyncStore.clear();
         mMessageQueue->commit();
         mSyncInProgress = false;
+        if (allChangesReplayed()) {
+            emit changesReplayed();
+        }
         if (error) {
             SinkWarning() << "Error during sync: " << error.errorMessage;
             return KAsync::error(error);
         }
-        return KAsync::null<void>();
+        //In case we got more requests meanwhile.
+        return processSyncQueue();
     });
 }
 
@@ -414,6 +418,15 @@ KAsync::Job<QByteArray> Synchronizer::replay(const ApplicationDomain::Folder &,
     return KAsync::null<QByteArray>();
 }
 
+bool Synchronizer::allChangesReplayed()
+{
+    if (!mSyncRequestQueue.isEmpty()) {
+        SinkTrace() << "Queue is not empty";
+        return false;
+    }
+    return ChangeReplay::allChangesReplayed();
+}
+
 #define REGISTER_TYPE(T)                                                          \
     template void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray &remoteId, const T &entity, const QHash<QByteArray, Sink::Query::Comparator> &mergeCriteria); \
     template void Synchronizer::modify(const T &entity);