Merge lp:~tiagosh/history-service/fix-1510655 into lp:history-service

[Tiago Salem Herrmann]

Do proper dbus demarshalling of detailProperties.

Do proper dbus demarshalling of detailProperties.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/history-service-ci/321/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/160
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/160/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/159

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

review: Approve (continuous-integration)

=== modified file 'src/participant.cpp'
--- src/participant.cpp	2015-10-13 19:13:41 +0000
+++ src/participant.cpp	2016-01-04 18:30:43 +0000
@@ -157,7 +157,17 @@
     QString contactId = properties[FieldContactId].toString();
     QString alias = properties[FieldAlias].toString();
     QString avatar = properties[FieldAvatar].toString();
-    QVariantMap detailProperties = properties[FieldDetailProperties].toMap();
+    QVariantMap detailProperties;
+    QVariant detailPropertiesVariant = properties[FieldDetailProperties];
+    if (detailPropertiesVariant.canConvert<QVariantMap>()) {
+        detailProperties = detailPropertiesVariant.toMap();
+    } else if (detailPropertiesVariant.canConvert<QDBusArgument>()) {
+        detailProperties = qdbus_cast<QVariantMap>(detailPropertiesVariant);
+        Q_FOREACH(const QString &key, detailProperties.keys()) {
+            QList<QVariant> list = qdbus_cast<QList<QVariant> >(detailProperties[key]);
+            detailProperties[key] = QVariant::fromValue(list);
+        }
+    }
 
     return Participant(accountId, identifier, contactId, alias, avatar, detailProperties);
 }