Merge lp:~phablet-team/history-service/include-message-when-group-cancelled into lp:history-service

[Roberto Mier Escandon]

Trying to get in history daemon the event of group cancelled to insert a new event in related thread, to be seen in UI

Trying to get in history daemon the event of group cancelled to insert a new event in related thread, to be seen in UI

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:285
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1336/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1336
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1199
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1199
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1199
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1179
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1179/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1179
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1179/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1179/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1179
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1179/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1179
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1179/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1179
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1179/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1179
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1179/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1179
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1179/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1179/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/6/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/history-service/include-message-when-group-cancelled]

286. By Tiago Salem Herrmann on 2016-08-26

merge parent branch

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:286
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/7/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1341/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1341
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1204
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1204
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1204
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1184
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1184/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1184
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1184/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1184/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1184
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1184/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1184
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1184/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1184
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1184/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1184
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1184/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1184/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1184/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/7/rebuild

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good. thanks.

review: Approve

[lp:~phablet-team/history-service/include-message-when-group-cancelled]

287. By Tiago Salem Herrmann on 2016-08-30

merge parent branch

288. By Tiago Salem Herrmann on 2016-10-06

merge parent branch

Unmerged revisions

=== modified file 'daemon/historydaemon.cpp'
--- daemon/historydaemon.cpp	2016-10-06 17:29:35 +0000
+++ daemon/historydaemon.cpp	2016-10-06 17:29:36 +0000
@@ -600,7 +600,22 @@
 
 void HistoryDaemon::onUpdateRoomParticipants()
 {
-    updateRoomParticipants(Tp::TextChannelPtr(qobject_cast<Tp::TextChannel*>(sender())));
+    Tp::TextChannelPtr channel(qobject_cast<Tp::TextChannel*>(sender()));
+
+    // evaluate if removed self handle and insert an information message in the thread in that case
+    if (channel->groupSelfContactRemoveInfo().isValid()) {
+        QVariantMap properties = propertiesFromChannel(channel);
+        QVariantMap thread = threadForProperties(channel->property(History::FieldAccountId).toString(),
+                                                                   History::EventTypeText,
+                                                                   properties,
+                                                                   matchFlagsForChannel(channel),
+                                                                   false);
+        if (!thread.isEmpty()) {
+            writeInformationEvent(thread, channel->groupSelfContactRemoveInfo().message());
+        }
+    }
+
+    updateRoomParticipants(channel);
 }
 
 void HistoryDaemon::updateRoomParticipants(const Tp::TextChannelPtr channel)