2 files changed, 32 insertions, 0 deletions

diff --git a/common/notifier.cpp b/common/notifier.cpp
index 1af65e9..1b7cbdb 100644
--- a/common/notifier.cpp
+++ b/common/notifier.cpp
@@ -49,6 +49,7 @@ public:
 
     QList<QSharedPointer<ResourceAccess>> resourceAccess;
     QList<std::function<void(const Notification &)>> handler;
+    QSharedPointer<Sink::ResultEmitter<QSharedPointer<Sink::ApplicationDomain::SinkResource> > > mResourceEmitter;
     QObject context;
 };
 
@@ -91,6 +92,9 @@ Notifier::Notifier(const Sink::Query &resourceQuery) : d(new Sink::Notifier::Pri
         SinkTraceCtx(resourceCtx) << "Resource query complete";
     });
     emitter->fetch({});
+    if (resourceQuery.liveQuery()) {
+        d->mResourceEmitter = emitter;
+    }
     result.first.exec();
 }
 
diff --git a/tests/notificationtest.cpp b/tests/notificationtest.cpp
index 3182d8e..2b54c26 100644
--- a/tests/notificationtest.cpp
+++ b/tests/notificationtest.cpp
@@ -135,6 +135,34 @@ private slots:
         //Modification triggered during sync
         QCOMPARE(status.at(2), static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
     }
+
+    void testNotifier()
+    {
+        QList<int> status;
+        Sink::Notifier notifier{Sink::Query{Sink::Query::LiveQuery}.resourceFilter("sink.dummy.instance2")};
+        notifier.registerHandler([&] (const Sink::Notification &notification) {
+            if (notification.type == Notification::Info) {
+                status << notification.code;
+            }
+        });
+
+        auto query = Query().resourceFilter("sink.dummy.instance2");
+        query.setType<ApplicationDomain::Mail>();
+        query.setFlags(Query::LiveQuery | Query::UpdateStatus);
+
+        auto resource = ApplicationDomain::ApplicationDomainType::createEntity<ApplicationDomain::SinkResource>("", "sink.dummy.instance2");
+        resource.setResourceType("sink.dummy");
+        VERIFYEXEC(Store::create(resource));
+
+        VERIFYEXEC(Sink::Store::synchronize(query));
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance2"));
+
+        QTRY_COMPARE(status.size(), 2);
+        //Sync progress of item
+        QCOMPARE(status.at(0), static_cast<int>(ApplicationDomain::SyncStatus::SyncInProgress));
+        QCOMPARE(status.at(1), static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
+    }
+
 };
 
 QTEST_MAIN(NotificationTest)