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

[Tiago Salem Herrmann]

- Add support for writing events from qml.
- Iterate over attachments when qdbus_cast fails.

- Add support for writing events from qml.
- Iterate over attachments when qdbus_cast fails.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'Ubuntu/History/historyeventmodel.cpp'
--- Ubuntu/History/historyeventmodel.cpp	2015-01-16 13:48:37 +0000
+++ Ubuntu/History/historyeventmodel.cpp	2015-02-09 20:48:02 +0000
@@ -223,6 +223,33 @@
     return History::Manager::instance()->removeEvents(events);
 }
 
+bool HistoryEventModel::writeEvents(const QVariantList &eventsProperties)
+{
+    History::Events events;
+    Q_FOREACH(const QVariant &entry, eventsProperties) {
+        QVariantMap eventProperties = entry.toMap();
+        History::Event event;
+        switch (eventProperties[History::FieldType].toInt()) {
+        case History::EventTypeText:
+            event = History::TextEvent::fromProperties(eventProperties);
+            break;
+        case History::EventTypeVoice:
+            event = History::VoiceEvent::fromProperties(eventProperties);
+            break;
+        }
+
+        if (!event.isNull()) {
+            events << event;
+        }
+    }
+
+    if (events.isEmpty()) {
+        return false;
+    }
+
+    return History::Manager::instance()->writeEvents(events);
+}
+
 bool HistoryEventModel::removeEventAttachment(const QString &accountId, const QString &threadId, const QString &eventId, int eventType, const QString &attachmentId)
 {
     History::TextEvent textEvent;

=== modified file 'Ubuntu/History/historyeventmodel.h'
--- Ubuntu/History/historyeventmodel.h	2015-01-16 13:48:37 +0000
+++ Ubuntu/History/historyeventmodel.h	2015-02-09 20:48:02 +0000
@@ -62,6 +62,7 @@
     virtual QHash<int, QByteArray> roleNames() const;
 
     Q_INVOKABLE bool removeEvents(const QVariantList &eventsProperties);
+    Q_INVOKABLE bool writeEvents(const QVariantList &eventsProperties);
     Q_INVOKABLE bool markEventAsRead(const QString &accountId, const QString &threadId, const QString &eventId, int eventType);
     Q_INVOKABLE bool removeEventAttachment(const QString &accountId, const QString &threadId, const QString &eventId, int eventType, const QString &attachmentId);
 

=== modified file 'Ubuntu/History/historymodel.h'
--- Ubuntu/History/historymodel.h	2014-09-24 20:10:24 +0000
+++ Ubuntu/History/historymodel.h	2015-02-09 20:48:02 +0000
@@ -43,6 +43,7 @@
     Q_ENUMS(MessageType)
     Q_ENUMS(MatchFlag)
     Q_ENUMS(MessageStatus)
+    Q_ENUMS(AttachmentFlag)
     Q_ENUMS(Role)
 
 public:
@@ -76,6 +77,13 @@
         MessageStatusPending = History::MessageStatusPending // pending attachment download
     };
 
+    enum AttachmentFlag
+    {
+        AttachmentDownloaded = History::AttachmentDownloaded,
+        AttachmentPending = History::AttachmentPending,
+        AttachmentError = History::AttachmentError
+    };
+ 
     enum Role {
         AccountIdRole = Qt::UserRole,
         ThreadIdRole,

=== modified file 'src/textevent.cpp'
--- src/textevent.cpp	2014-09-23 12:30:29 +0000
+++ src/textevent.cpp	2015-02-09 20:48:02 +0000
@@ -184,6 +184,13 @@
 
     // read the attachments
     QList<QVariantMap> attachmentProperties = qdbus_cast<QList<QVariantMap> >(properties[FieldAttachments]);
+    // dbus_cast fails if the map was generated by a qml app, so we demarshal it by hand
+    if (attachmentProperties.isEmpty()) {
+        QVariantList attachmentList = properties[FieldAttachments].toList();
+        Q_FOREACH(const QVariant &attachmentMap, attachmentList) {
+            attachmentProperties << attachmentMap.toMap();
+        }
+    }
     TextEventAttachments attachments;
     Q_FOREACH(const QVariantMap &map, attachmentProperties) {
         TextEventAttachment attachment = TextEventAttachment::fromProperties(map);