Merge lp:~boiko/history-service/fix_1234611 into lp:history-service

[Gustavo Pichorim Boiko]

Make sure the ThreadsModified signal is emitted with the threads up-to-date.

Make sure the ThreadsModified signal is emitted with the threads up-to-date.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/history-service-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-saucy-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-saucy-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/history-service-saucy-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-saucy-i386-ci/71

Click here to trigger a rebuild:
http://s-jenkins:8080/job/history-service-ci/71/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good. tested on the device and it works fine.
+1

review: Approve

=== modified file 'daemon/historydaemon.cpp'
--- daemon/historydaemon.cpp	2013-09-30 16:50:55 +0000
+++ daemon/historydaemon.cpp	2013-10-03 15:00:26 +0000
@@ -169,14 +169,7 @@
         // get the threads for the events to notify their modifications
         QString accountId = event[History::FieldAccountId].toString();
         QString threadId = event[History::FieldThreadId].toString();
-        QVariantMap thread = getSingleThread(type, accountId, threadId);
-        if (!thread.isEmpty() && !threads.contains(thread)) {
-            threads << thread;
-        }
-
-        // set the participants field in the event
         QVariantMap savedEvent = event;
-        savedEvent[History::FieldParticipants] = thread[History::FieldParticipants];
 
         // and finally write the event
         switch (type) {
@@ -188,6 +181,15 @@
             break;
         }
 
+        // only get the thread AFTER the event is written to make sure it is up-to-date
+        QVariantMap thread = getSingleThread(type, accountId, threadId);
+        threads.removeAll(thread);
+        threads << thread;
+
+        // set the participants field in the event
+        savedEvent[History::FieldParticipants] = thread[History::FieldParticipants];
+
+
         // check if the event was a new one or a modification to an existing one
         switch (result) {
         case History::EventWriteCreated: