Merge lp:~boiko/telephony-service/protocol_background_and_overlay into lp:telephony-service

[Gustavo Pichorim Boiko]

Expose extra information about the protocols we support.

Expose extra information about the protocols we support.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1146
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/623/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/291/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/291/console

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

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Looks good.

review: Approve

[Tiago Salem Herrmann (tiagosh)]

Ops, actually, removing the multimedia.protocol file make lots of tests fail.

review: Needs Fixing

[lp:~boiko/telephony-service/protocol_background_and_overlay]

1147. By Gustavo Pichorim Boiko on 2015-11-26

Re-add the multimedia protocol.

[Tiago Salem Herrmann (tiagosh)]

review: Needs Fixing

[lp:~boiko/telephony-service/protocol_background_and_overlay]

1148. By Gustavo Pichorim Boiko on 2015-12-01

Rename property.

[Tiago Salem Herrmann (tiagosh)]

looks good now.
Thanks.

review: Approve

[lp:~boiko/telephony-service/protocol_background_and_overlay]

1149. By Gustavo Pichorim Boiko on 2015-12-09

Merge parent branch

1150. By Gustavo Pichorim Boiko on 2015-12-09

Merge parent

Unmerged revisions

=== added file 'assets/message_watermark.png'
Binary files assets/message_watermark.png	1970-01-01 00:00:00 +0000 and assets/message_watermark.png	2015-12-09 13:28:53 +0000 differ
=== modified file 'handler/Handler.xml'
--- handler/Handler.xml	2015-11-17 17:23:54 +0000
+++ handler/Handler.xml	2015-12-09 13:28:53 +0000
@@ -19,6 +19,7 @@
             <arg name="recipients" type="as" direction="in"/>
             <arg name="message" type="s" direction="in"/>
             <arg name="attachments" type="a(sss)" direction="in"/>
+            <arg name="accountIdOut" type="s" direction="out"/>
             <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="AttachmentList"/>
             <arg name="properties" type="a{sv}" direction="in"/>
             <annotation name="org.qtproject.QtDBus.QtTypeName.In4" value="QVariantMap"/>

=== modified file 'handler/handlerdbus.cpp'
--- handler/handlerdbus.cpp	2015-11-17 17:23:54 +0000
+++ handler/handlerdbus.cpp	2015-12-09 13:28:53 +0000
@@ -93,9 +93,9 @@
     return true;
 }
 
-void HandlerDBus::SendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments, const QVariantMap &properties)
+QString HandlerDBus::SendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments, const QVariantMap &properties)
 {
-    TextHandler::instance()->sendMessage(accountId, recipients, message, attachments, properties);
+    return TextHandler::instance()->sendMessage(accountId, recipients, message, attachments, properties);
 }
 
 void HandlerDBus::AcknowledgeMessages(const QStringList &numbers, const QStringList &messageIds, const QString &accountId)

=== modified file 'handler/handlerdbus.h'
--- handler/handlerdbus.h	2015-11-17 17:23:54 +0000
+++ handler/handlerdbus.h	2015-12-09 13:28:53 +0000
@@ -55,7 +55,7 @@
     bool connectToBus();
 
     // messages related
-    Q_NOREPLY void SendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments, const QVariantMap &properties);
+    QString SendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments, const QVariantMap &properties);
     Q_NOREPLY void AcknowledgeMessages(const QStringList &numbers, const QStringList &messageIds, const QString &accountId);
     Q_NOREPLY void StartChat(const QString &accountId, const QStringList &participants);
     Q_NOREPLY void StartChatRoom(const QString &accountId, const QStringList &initialParticipants, const QVariantMap &properties);

=== modified file 'handler/texthandler.cpp'
--- handler/texthandler.cpp	2015-11-17 17:23:54 +0000
+++ handler/texthandler.cpp	2015-12-09 13:28:53 +0000
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 Canonical, Ltd.
  *
  * Authors:
  *  Gustavo Pichorim Boiko <[e-mail]>
+ *  Tiago Salem Herrmann <[e-mail]>
  *
  * This file is part of telephony-service.
  *
@@ -32,12 +33,20 @@
 
 #define SMIL_TEXT_REGION "<region id=\"Text\" width=\"100%\" height=\"100%\" fit=\"scroll\" />"
 #define SMIL_IMAGE_REGION "<region id=\"Image\" width=\"100%\" height=\"100%\" fit=\"meet\" />"
+#define SMIL_VIDEO_REGION "<region id=\"Video\" width=\"100%\" height=\"100%\" fit=\"meet\" />"
+#define SMIL_AUDIO_REGION "<region id=\"Audio\" width=\"100%\" height=\"100%\" fit=\"meet\" />"
 #define SMIL_TEXT_PART "<par dur=\"3s\">\
        <text src=\"cid:%1\" region=\"Text\" />\
      </par>"
 #define SMIL_IMAGE_PART "<par dur=\"5000ms\">\
        <img src=\"cid:%1\" region=\"Image\" />\
      </par>"
+#define SMIL_VIDEO_PART "<par>\
+       <video src=\"cid:%1\" region=\"Video\" />\
+     </par>"
+#define SMIL_AUDIO_PART "<par>\
+       <audio src=\"cid:%1\" region=\"Audio\" />\
+     </par>"
 
 #define SMIL_FILE "<smil>\
    <head>\
@@ -139,7 +148,7 @@
     // start chatting to the contacts
     Q_FOREACH(Tp::ContactPtr contact, contacts) {
         // hold the ContactPtr to make sure its refcounting stays bigger than 0
-        mContacts[contact->id()] = contact;
+        mContacts[account->uniqueIdentifier()][contact->id()] = contact;
     }
 }
 
@@ -148,7 +157,7 @@
     Tp::MessagePartList message;
     Tp::MessagePart header;
     QString smil, regions, parts;
-    bool hasImage = false, hasText = false, isMMS = false;
+    bool hasImage = false, hasText = false, hasVideo = false, hasAudio = false, isMMS = false;
 
     AccountEntry *account = TelepathyHelper::instance()->accountForId(pendingMessage.accountId);
     if (!account) {
@@ -207,6 +216,16 @@
                     fileData = attachmentFile.readAll();
                 }
             }
+        } else if (attachment.contentType.startsWith("video/")) {
+            if (isMMS) {
+                hasVideo = true;
+                parts += QString(SMIL_VIDEO_PART).arg(attachment.id);
+            }
+        } else if (attachment.contentType.startsWith("audio/")) {
+            if (isMMS) {
+                hasAudio = true;
+                parts += QString(SMIL_AUDIO_PART).arg(attachment.id);
+            }
         } else if (attachment.contentType.startsWith("text/plain")) {
             if (isMMS) {
                 hasText = true;
@@ -230,6 +249,14 @@
             attachmentFile.remove();
         }
 
+        if (hasVideo) {
+            regions += QString(SMIL_VIDEO_REGION);
+        }
+
+        if (hasAudio) {
+            regions += QString(SMIL_AUDIO_REGION);
+        }
+
         if (hasText) {
             regions += QString(SMIL_TEXT_REGION);
         }
@@ -274,28 +301,54 @@
     return message;
 }
 
-void TextHandler::sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments, const QVariantMap &properties)
+QString TextHandler::sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments, const QVariantMap &properties)
 {
     AccountEntry *account = TelepathyHelper::instance()->accountForId(accountId);
     if (!account) {
         // account does not exist
-        return;
+        return QString();
     }
 
     // check if the message should be sent via multimedia account
-    if (account->type() == AccountEntry::PhoneAccount) {
-        // we just use fallback to 1-1 chats
-        if (recipients.size() == 1) {
-
-            Q_FOREACH(AccountEntry *newAccount, TelepathyHelper::instance()->accounts()) {
-                // TODO: we have to find the multimedia account that matches the same phone number, 
-                // but for now we just pick any multimedia connected account
-                if (newAccount->type() == AccountEntry::MultimediaAccount) {
-                    if (newAccount->connected()) {
-                        account = newAccount;
-                        break;
-                    }
-                }
+    // we just use fallback to 1-1 chats
+    if (account->type() == AccountEntry::PhoneAccount && recipients.size() == 1) {
+        Q_FOREACH(AccountEntry *newAccount, TelepathyHelper::instance()->accounts()) {
+            // TODO: we have to find the multimedia account that matches the same phone number, 
+            // but for now we just pick any multimedia connected account
+            if (newAccount->type() != AccountEntry::MultimediaAccount) {
+                continue;
+            }
+            // FIXME: the fallback implementation needs to be changed to use protocol info and create a map of
+            // accounts. Also, it needs to check connection capabilities to determine if we can send message
+            // to offline contacts.
+            bool shouldFallback = false;
+            // if the account is offline, dont fallback to this account
+            if (!newAccount->connected()) {
+                continue;
+            }
+            QList<Tp::TextChannelPtr> channels = existingChannels(recipients, newAccount->accountId());
+            // check if we have a channel for this contact already and get the contact pointer from there,
+            // this way we avoid doing the while(op->isFinished()) all the time
+            if (!channels.isEmpty()) {
+                // if the contact is known, force fallback to this account
+                Tp::Presence presence = channels.first()->targetContact()->presence();
+                shouldFallback = (presence.type() == Tp::ConnectionPresenceTypeAvailable ||
+                    presence.type() == Tp::ConnectionPresenceTypeOffline);
+            } else {
+                Tp::PendingOperation *op = newAccount->account()->connection()->contactManager()->contactsForIdentifiers(recipients);
+                while (!op->isFinished()) {
+                    qApp->processEvents();
+                }
+                Tp::PendingContacts *pc = qobject_cast<Tp::PendingContacts*>(op);
+                if (pc) {
+                    Tp::Presence presence = pc->contacts().first()->presence();
+                    shouldFallback = (presence.type() == Tp::ConnectionPresenceTypeAvailable ||
+                        presence.type() == Tp::ConnectionPresenceTypeOffline);
+                }
+            }
+            if (shouldFallback) {
+                account = newAccount;
+                break;
             }
         }
     }
@@ -304,21 +357,24 @@
     QStringList sortedRecipients = recipients;
     sortedRecipients.sort();
     PendingMessage pendingMessage = {account->accountId(), sortedRecipients, message, attachments, properties};
+
     if (!account->connected()) {
         mPendingMessages.append(pendingMessage);
-        return;
+        return account->accountId();
     }
 
     QList<Tp::TextChannelPtr> channels = existingChannels(recipients, account->accountId());
     if (channels.isEmpty()) {
         mPendingMessages.append(pendingMessage);
         startChat(sortedRecipients, account->accountId());
-        return;
+        return account->accountId();
     }
 
     connect(channels.last()->send(buildMessage(pendingMessage)),
             SIGNAL(finished(Tp::PendingOperation*)),
             SLOT(onMessageSent(Tp::PendingOperation*)));
+
+    return account->accountId();
 }
 
 void TextHandler::acknowledgeMessages(const QStringList &recipients, const QStringList &messageIds, const QString &accountId)
@@ -351,12 +407,26 @@
     }
 }
 
+void TextHandler::onTextChannelInvalidated()
+{
+    Tp::TextChannelPtr textChannel(qobject_cast<Tp::TextChannel*>(sender()));
+    mChannels.removeAll(textChannel);
+    AccountEntry *account = TelepathyHelper::instance()->accountForConnection(textChannel->connection());
+    if (account) {
+       mContacts.remove(account->accountId());
+    }
+}
+
 void TextHandler::onTextChannelAvailable(Tp::TextChannelPtr channel)
 {
     AccountEntry *account = TelepathyHelper::instance()->accountForConnection(channel->connection());
     if (!account) {
         return;
     }
+    connect(channel.data(),
+            SIGNAL(invalidated(Tp::DBusProxy*,const QString&, const QString&)),
+            SLOT(onTextChannelInvalidated()));
+
     QString accountId = account->accountId();
     mChannels.append(channel);
 

=== modified file 'handler/texthandler.h'
--- handler/texthandler.h	2015-11-17 17:23:54 +0000
+++ handler/texthandler.h	2015-12-09 13:28:53 +0000
@@ -47,12 +47,13 @@
     void startChat(const Tp::AccountPtr &account, const Tp::Contacts &contacts);
 
 public Q_SLOTS:
-    void sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments, const QVariantMap &properties);
+    QString sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments, const QVariantMap &properties);
     void acknowledgeMessages(const QStringList &recipients, const QStringList &messageIds, const QString &accountId);
     void acknowledgeAllMessages(const QStringList &recipients, const QString &accountId);
 
 protected Q_SLOTS:
     void onTextChannelAvailable(Tp::TextChannelPtr channel);
+    void onTextChannelInvalidated();
     void onContactsAvailable(Tp::PendingOperation *op);
     void onMessageSent(Tp::PendingOperation *op);
     void onConnectedChanged();
@@ -65,7 +66,7 @@
     Tp::MessagePartList buildMessage(const PendingMessage &pendingMessage);
 
     QList<Tp::TextChannelPtr> mChannels;
-    QMap<QString, Tp::ContactPtr> mContacts;
+    QMap<QString, QMap<QString, Tp::ContactPtr> > mContacts;
     QList<PendingMessage> mPendingMessages;
 };
 

=== modified file 'libtelephonyservice/chatmanager.cpp'
--- libtelephonyservice/chatmanager.cpp	2015-11-17 17:23:54 +0000
+++ libtelephonyservice/chatmanager.cpp	2015-12-09 13:28:53 +0000
@@ -95,12 +95,12 @@
     return manager;
 }
 
-void ChatManager::sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const QVariant &attachments, const QVariantMap &properties)
+QString ChatManager::sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const QVariant &attachments, const QVariantMap &properties)
 {
     AccountEntry *account = TelepathyHelper::instance()->accountForId(accountId);
 
     if (!account) {
-        return;
+        return QString();
     }
 
     // check if files should be copied to a temporary location before passing them to handler
@@ -121,16 +121,16 @@
             tmpFile.setAutoRemove(false);
             if (!tmpFile.open()) {
                 qWarning() << "Unable to create a temporary file";
-                return;
+                return QString();
             }
             QFile originalFile(list.at(2).toString());
             if (!originalFile.open(QIODevice::ReadOnly)) {
                 qWarning() << "Attachment file not found";
-                return;
+                return QString();
             }
             if (tmpFile.write(originalFile.readAll()) == -1) {
                 qWarning() << "Failed to write attachment to a temporary file";
-                return;
+                return QString();
             }
             newAttachment.filePath = tmpFile.fileName();
             tmpFile.close();
@@ -142,7 +142,11 @@
     }
 
     QDBusInterface *phoneAppHandler = TelepathyHelper::instance()->handlerInterface();
-    phoneAppHandler->call("SendMessage", account->accountId(), recipients, message, QVariant::fromValue(newAttachments), properties);
+    QDBusReply<QString> reply = phoneAppHandler->call("SendMessage", account->accountId(), recipients, message, QVariant::fromValue(newAttachments), properties);
+    if (reply.isValid()) {
+        return reply.value();
+    }
+    return QString();
 }
 
 void ChatManager::onTextChannelAvailable(Tp::TextChannelPtr channel)

=== modified file 'libtelephonyservice/chatmanager.h'
--- libtelephonyservice/chatmanager.h	2015-11-17 17:23:54 +0000
+++ libtelephonyservice/chatmanager.h	2015-12-09 13:28:53 +0000
@@ -39,7 +39,7 @@
 public:
     static ChatManager *instance();
 
-    Q_INVOKABLE void sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const QVariant &attachments = QVariant(), const QVariantMap &properties = QVariantMap());
+    Q_INVOKABLE QString sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const QVariant &attachments = QVariant(), const QVariantMap &properties = QVariantMap());
     Q_INVOKABLE ChatEntry *chatEntryForParticipants(const QString &accountId, const QStringList &participants, bool create = false);
     Q_INVOKABLE ChatEntry *chatEntryForChatRoom(const QString &accountId, const QVariantMap &properties, bool create);
 

=== modified file 'libtelephonyservice/protocol.cpp'
--- libtelephonyservice/protocol.cpp	2015-06-10 21:05:50 +0000
+++ libtelephonyservice/protocol.cpp	2015-12-09 13:28:53 +0000
@@ -3,6 +3,7 @@
  *
  * Authors:
  *  Gustavo Pichorim Boiko <[e-mail]>
+ *  Tiago Salem Herrmann <[e-mail]>
  *
  * This file is part of telephony-service.
  *
@@ -23,8 +24,8 @@
 #include <QFileInfo>
 #include <QSettings>
 
-Protocol::Protocol(const QString &name, Features features, const QString &fallbackProtocol, QObject *parent)
-: QObject(parent), mName(name), mFeatures(features), mFallbackProtocol(fallbackProtocol)
+Protocol::Protocol(const QString &name, Features features, const QString &fallbackProtocol, const QString &backgroundImage, const QString &icon, const QString &serviceName, QObject *parent)
+: QObject(parent), mName(name), mFeatures(features), mFallbackProtocol(fallbackProtocol), mBackgroundImage(backgroundImage), mIcon(icon), mServiceName(serviceName)
 {
 }
 
@@ -33,6 +34,16 @@
     return mName;
 }
 
+QString Protocol::icon() const
+{
+    return mIcon;
+}
+
+QString Protocol::serviceName() const
+{
+    return mServiceName;
+}
+
 Protocol::Features Protocol::features() const
 {
     return mFeatures;
@@ -43,6 +54,11 @@
     return mFallbackProtocol;
 }
 
+QString Protocol::backgroundImage() const
+{
+    return mBackgroundImage;
+}
+
 Protocol *Protocol::fromFile(const QString &fileName)
 {
     QFileInfo file(fileName);
@@ -52,6 +68,7 @@
 
     QString protocolName = file.baseName();
     QSettings settings(fileName, QSettings::IniFormat);
+    settings.setIniCodec("UTF-8");
     settings.beginGroup("Protocol");
     QString name = settings.value("Name", protocolName).toString();
     QStringList featureList = settings.value("Features").toStringList();
@@ -64,6 +81,9 @@
         }
     }
     QString fallbackProtocol = settings.value("FallbackProtocol").toString();
+    QString backgroundImage = settings.value("BackgroundImage").toString();
+    QString icon = settings.value("Icon").toString();
+    QString serviceName = settings.value("ServiceName").toString();
 
-    return new Protocol(name, features, fallbackProtocol);
+    return new Protocol(name, features, fallbackProtocol, backgroundImage, icon, serviceName);
 }

=== modified file 'libtelephonyservice/protocol.h'
--- libtelephonyservice/protocol.h	2015-06-10 21:05:50 +0000
+++ libtelephonyservice/protocol.h	2015-12-09 13:28:53 +0000
@@ -3,6 +3,7 @@
  *
  * Authors:
  *  Gustavo Pichorim Boiko <[e-mail]>
+ *  Tiago Salem Herrmann <[e-mail]>
  *
  * This file is part of telephony-service.
  *
@@ -36,6 +37,16 @@
 
     /// @brief the fallback protocol to be used for operations that support it (mainly text features)
     Q_PROPERTY(QString fallbackProtocol READ fallbackProtocol CONSTANT)
+
+    /// @brief the file path for the image that represents this protocol
+    Q_PROPERTY(QString backgroundImage READ backgroundImage CONSTANT)
+
+    /// @brief the file path for the image that represents this protocol
+    Q_PROPERTY(QString icon READ icon CONSTANT)
+
+    /// @brief the title that represents this protocol
+    Q_PROPERTY(QString serviceName READ serviceName CONSTANT)
+
 public:
     enum Feature {
         TextChats = 0x1,
@@ -46,18 +57,24 @@
     QString name() const;
     Features features() const;
     QString fallbackProtocol() const;
+    QString backgroundImage() const;
+    QString icon() const;
+    QString serviceName() const;
 
     static Protocol *fromFile(const QString &fileName);
 
     friend class ProtocolManager;
 
 protected:
-    explicit Protocol(const QString &name, Features features, const QString &fallbackProtocol = QString::null, QObject *parent = 0);
+    explicit Protocol(const QString &name, Features features, const QString &fallbackProtocol = QString::null, const QString &backgroundImage = QString::null, const QString &icon = QString::null, const QString &serviceName = QString::null, QObject *parent = 0);
 
 private:
     QString mName;
     Features mFeatures;
     QString mFallbackProtocol;
+    QString mBackgroundImage;
+    QString mIcon;
+    QString mServiceName;
 };
 
 typedef QList<Protocol*> Protocols;

=== added file 'protocols/multimedia.protocol'
--- protocols/multimedia.protocol	1970-01-01 00:00:00 +0000
+++ protocols/multimedia.protocol	2015-12-09 13:28:53 +0000
@@ -0,0 +1,4 @@
+[Protocol]
+Name=multimedia
+Features=text
+FallbackProtocol=ofono

=== removed file 'protocols/multimedia.protocol'
--- protocols/multimedia.protocol	2015-06-11 16:48:18 +0000
+++ protocols/multimedia.protocol	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[Protocol]
-Name=multimedia
-Features=text
-FallbackProtocol=ofono

=== modified file 'protocols/ofono.protocol'
--- protocols/ofono.protocol	2015-06-10 21:05:50 +0000
+++ protocols/ofono.protocol	2015-12-09 13:28:53 +0000
@@ -2,3 +2,4 @@
 Name=ofono
 Features=text,voice
 FallbackProtocol=
+BackgroundImage=/usr/share/telephony-service/assets/message_watermark.png

=== modified file 'tests/common/mock/MockConnection.xml'
--- tests/common/mock/MockConnection.xml	2015-11-17 17:23:54 +0000
+++ tests/common/mock/MockConnection.xml	2015-12-09 13:28:53 +0000
@@ -210,9 +210,12 @@
                 A message was sent from the client.
             ]]></dox:d>
             <arg name="message" type="s"/>
+            <arg name="attachments" type="av"/>
             <arg name="properties" type="a{sv}"/>
-            <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
-            <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantList"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantList"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QVariantMap"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.Out2" value="QVariantMap"/>
         </signal>
         <signal name="CallReceived">
             <dox:d><![CDATA[

=== modified file 'tests/common/mock/connection.cpp'
--- tests/common/mock/connection.cpp	2015-11-17 17:23:54 +0000
+++ tests/common/mock/connection.cpp	2015-12-09 13:28:53 +0000
@@ -371,7 +371,7 @@
     MockTextChannel *channel = new MockTextChannel(this, recipients, targetHandle);
     QObject::connect(channel, SIGNAL(messageRead(QString)), SLOT(onMessageRead(QString)));
     QObject::connect(channel, SIGNAL(destroyed()), SLOT(onTextChannelClosed()));
-    QObject::connect(channel, SIGNAL(messageSent(QString,QVariantMap)), SIGNAL(messageSent(QString,QVariantMap)));
+    QObject::connect(channel, SIGNAL(messageSent(QString,QVariantList,QVariantMap)), SIGNAL(messageSent(QString,QVariantList,QVariantMap)));
     qDebug() << channel;
     mTextChannels << channel;
     return channel->baseChannel();

=== modified file 'tests/common/mock/connection.h'
--- tests/common/mock/connection.h	2015-11-17 17:23:54 +0000
+++ tests/common/mock/connection.h	2015-12-09 13:28:53 +0000
@@ -110,7 +110,7 @@
 
 Q_SIGNALS:
     void messageRead(const QString &messageId);
-    void messageSent(const QString &message, const QVariantMap &info);
+    void messageSent(const QString &message, const QVariantList &attachments, const QVariantMap &info);
     void callReceived(const QString &callerId);
     void callEnded(const QString &callerId);
     void callStateChanged(const QString &callerId, const QString &objectPath, const QString &state);

=== modified file 'tests/common/mock/mockconnectiondbus.cpp'
--- tests/common/mock/mockconnectiondbus.cpp	2015-11-17 17:23:54 +0000
+++ tests/common/mock/mockconnectiondbus.cpp	2015-12-09 13:28:53 +0000
@@ -32,8 +32,8 @@
             SIGNAL(messageRead(QString)),
             SIGNAL(MessageRead(QString)));
     connect(mConnection,
-            SIGNAL(messageSent(QString,QVariantMap)),
-            SIGNAL(MessageSent(QString,QVariantMap)));
+            SIGNAL(messageSent(QString,QVariantList,QVariantMap)),
+            SIGNAL(MessageSent(QString,QVariantList,QVariantMap)));
     connect(mConnection,
             SIGNAL(callReceived(QString)),
             SIGNAL(CallReceived(QString)));

=== modified file 'tests/common/mock/mockconnectiondbus.h'
--- tests/common/mock/mockconnectiondbus.h	2015-11-17 17:23:54 +0000
+++ tests/common/mock/mockconnectiondbus.h	2015-12-09 13:28:53 +0000
@@ -71,7 +71,7 @@
 Q_SIGNALS:
     // signals that will be relayed into the bus
     void MessageRead(const QString &messageId);
-    void MessageSent(const QString &mesasge, const QVariantMap &properties);
+    void MessageSent(const QString &message, const QVariantList &attachments, const QVariantMap &properties);
     void CallReceived(const QString &callerId);
     void CallEnded(const QString &callerId);
     void CallStateChanged(const QString &callerId, const QString &objectPath, const QString &state);

=== modified file 'tests/common/mock/textchannel.cpp'
--- tests/common/mock/textchannel.cpp	2015-11-17 14:30:19 +0000
+++ tests/common/mock/textchannel.cpp	2015-12-09 13:28:53 +0000
@@ -105,13 +105,12 @@
 QString MockTextChannel::sendMessage(const Tp::MessagePartList& message, uint flags, Tp::DBusError* error)
 {
     Tp::MessagePart header = message.at(0);
-    Tp::MessagePart body = message.at(1);
 
     static int serial = 0;
 
     // FIXME: check what other data we need to emit in the signal
     QString id = QString("sentmessage%1").arg(serial++);
-    QString messageText = body["content"].variant().toString();
+    QString messageText;
     QVariantMap properties;
     QMap<QString, QDBusVariant>::const_iterator it = header.constBegin();
     while (it != header.constEnd()) {
@@ -122,7 +121,24 @@
     properties["Recipients"] = mRecipients;
     properties["Id"] = id;
 
-    Q_EMIT messageSent(messageText, properties);
+    QVariantList attachments;
+    Tp::MessagePartList messageList = message;
+    messageList.pop_front();
+    Q_FOREACH(const Tp::MessagePart& messagePart, messageList) {
+        QVariantMap attachment;
+        if (messagePart.contains("content-type") && messagePart["content-type"].variant().toString().startsWith("text/")) {
+            messageText = messagePart["content"].variant().toString();
+            continue;
+        }
+        QMap<QString, QDBusVariant>::const_iterator it = messagePart.constBegin();
+        while (it != messagePart.constEnd()) {
+            attachment[it.key()] = it.value().variant().toString();
+            it++;
+        }
+        attachments << attachment;
+    }
+
+    Q_EMIT messageSent(messageText, attachments, properties);
 
     QTimer *deliveryReportTimer = new QTimer(this);
     deliveryReportTimer->setSingleShot(true);

=== modified file 'tests/common/mock/textchannel.h'
--- tests/common/mock/textchannel.h	2015-03-20 19:00:21 +0000
+++ tests/common/mock/textchannel.h	2015-12-09 13:28:53 +0000
@@ -54,7 +54,7 @@
 
 Q_SIGNALS:
     void messageRead(const QString &id);
-    void messageSent(const QString &message, const QVariantMap &info);
+    void messageSent(const QString &message, const QVariantList &attachments, const QVariantMap &info);
 
 private:
     ~MockTextChannel();

=== modified file 'tests/handler/HandlerTest.cpp'
--- tests/handler/HandlerTest.cpp	2015-10-09 16:13:30 +0000
+++ tests/handler/HandlerTest.cpp	2015-12-09 13:28:53 +0000
@@ -41,10 +41,12 @@
     void testCallProperties();
     void testConferenceCall();
     void testSendMessage();
+    void testSendMessageWithAttachments();
     void testAcknowledgeMessage();
     void testAcknowledgeAllMessages();
     void testActiveCallIndicator();
     void testNotApprovedChannels();
+    void testMultimediaFallback();
 
 private:
     void registerApprover();
@@ -53,6 +55,11 @@
     Approver *mApprover;
     MockController *mMockController;
     Tp::AccountPtr mTpAccount;
+    MockController *mMultimediaMockController;
+    Tp::AccountPtr mMultimediaTpAccount;
+    MockController *mOfonoMockController;
+    Tp::AccountPtr mOfonoTpAccount;
+
 };
 
 void HandlerTest::initTestCase()
@@ -71,12 +78,20 @@
 
     // and create the mock controller
     mMockController = new MockController("mock", this);
+
+    mOfonoTpAccount = addAccount("mock", "ofono", "the account");
+    mOfonoMockController = new MockController("ofono", this);
+
+    mMultimediaTpAccount = addAccount("mock", "multimedia", "the account");
+    mMultimediaMockController = new MockController("multimedia", this);
 }
 
 void HandlerTest::cleanup()
 {
     doCleanup();
     mMockController->deleteLater();
+    mMultimediaMockController->deleteLater();
+    mOfonoMockController->deleteLater();
 }
 
 void HandlerTest::testMakingCalls()
@@ -275,7 +290,7 @@
 {
     QString recipient("22222222");
     QString message("Hello, world!");
-    QSignalSpy messageSentSpy(mMockController, SIGNAL(MessageSent(QString,QVariantMap)));
+    QSignalSpy messageSentSpy(mMockController, SIGNAL(MessageSent(QString,QVariantList,QVariantMap)));
     // FIXME: add support for multiple accounts
     HandlerController::instance()->sendMessage(mTpAccount->uniqueIdentifier(), QStringList() << recipient, message);
     TRY_COMPARE(messageSentSpy.count(), 1);
@@ -286,6 +301,31 @@
     QCOMPARE(messageProperties["Recipients"].value<QStringList>().first(), recipient);
 }
 
+void HandlerTest::testSendMessageWithAttachments()
+{
+    QString recipient("22222222");
+    QString message("Hello, world!");
+    QSignalSpy messageSentSpy(mMultimediaMockController, SIGNAL(MessageSent(QString,QVariantList,QVariantMap)));
+
+    QTemporaryFile outputFile("audioXXXXXX.ogg");
+    outputFile.open();
+    AttachmentStruct attachment{"id", "audio/ogg", outputFile.fileName()};
+    HandlerController::instance()->sendMessage(mOfonoTpAccount->uniqueIdentifier(), QStringList() << recipient, message, AttachmentList() << attachment);
+    TRY_COMPARE(messageSentSpy.count(), 1);
+    outputFile.close();
+
+    QString sentMessage = messageSentSpy.first()[0].toString();
+    QVariantMap messageProperties = messageSentSpy.first()[2].value<QVariantMap>();
+    QCOMPARE(sentMessage, message);
+    QCOMPARE(messageProperties["Recipients"].value<QStringList>().count(), 1);
+    QCOMPARE(messageProperties["Recipients"].value<QStringList>().first(), recipient);
+    
+    QVariantList messageAttachments = qdbus_cast<QVariantList>(messageSentSpy.first()[1]);
+    QVariantMap firstAttachment = qdbus_cast<QVariantMap>(messageAttachments.first());
+    QCOMPARE(firstAttachment["content-type"].toString(), QString("audio/ogg"));
+    QCOMPARE(firstAttachment["identifier"].toString(), QString("id"));
+}
+
 void HandlerTest::testAcknowledgeMessage()
 {
     // if we register the observer before this test, other tests fail
@@ -293,7 +333,7 @@
     QString recipient("84376666");
     QString recipient2("[phone]");
     QString message("Hello, world!");
-    QSignalSpy messageSentSpy(mMockController, SIGNAL(MessageSent(QString,QVariantMap)));
+    QSignalSpy messageSentSpy(mMockController, SIGNAL(MessageSent(QString,QVariantList,QVariantMap)));
 
     // first send a message to a certain number so the handler request one channel
     HandlerController::instance()->sendMessage(mTpAccount->uniqueIdentifier(), QStringList() << recipient, message);
@@ -327,7 +367,7 @@
     QString recipient2("[phone]");
     QString message("Hello, world! %1");
     int messageCount = 10;
-    QSignalSpy messageSentSpy(mMockController, SIGNAL(MessageSent(QString,QVariantMap)));
+    QSignalSpy messageSentSpy(mMockController, SIGNAL(MessageSent(QString,QVariantList,QVariantMap)));
 
     // first send a message to a certain number so the handler request one channel
     HandlerController::instance()->sendMessage(mTpAccount->uniqueIdentifier(), QStringList() << recipient, message);
@@ -403,6 +443,44 @@
     QCOMPARE(callStateSpy.last()[2].toString(), QString("initialised"));
 }
 
+void HandlerTest::testMultimediaFallback()
+{
+    QString recipient("22222222");
+    QString message("Hello, world!");
+    mMultimediaMockController->SetContactPresence(recipient, Tp::ConnectionPresenceTypeAvailable, "available", "");
+    // We have to make sure the handler already has the new state
+    QTest::qWait(1000);
+
+    QSignalSpy messageSentOfonoSpy(mOfonoMockController, SIGNAL(MessageSent(QString,QVariantList,QVariantMap)));
+    QSignalSpy messageSentMultimediaSpy(mMultimediaMockController, SIGNAL(MessageSent(QString,QVariantList,QVariantMap)));
+
+    QString accountId = HandlerController::instance()->sendMessage(mOfonoTpAccount->uniqueIdentifier(), QStringList() << recipient, message);
+    QCOMPARE(accountId, mMultimediaTpAccount->uniqueIdentifier());
+    TRY_COMPARE(messageSentMultimediaSpy.count(), 1);
+    QCOMPARE(messageSentOfonoSpy.count(), 0);
+    QString sentMessage = messageSentMultimediaSpy.first().first().toString();
+    QVariantMap messageProperties = messageSentMultimediaSpy.first().last().value<QVariantMap>();
+    QCOMPARE(sentMessage, message);
+    QCOMPARE(messageProperties["Recipients"].value<QStringList>().count(), 1);
+    QCOMPARE(messageProperties["Recipients"].value<QStringList>().first(), recipient);
+
+    messageSentMultimediaSpy.clear();
+    messageSentOfonoSpy.clear();
+
+    mMultimediaMockController->SetContactPresence(recipient, Tp::ConnectionPresenceTypeUnknown, "offline", "");
+    // We have to make sure the handler already has the new state
+    QTest::qWait(1000);
+    HandlerController::instance()->sendMessage(mOfonoTpAccount->uniqueIdentifier(), QStringList() << recipient, message);
+    TRY_COMPARE(messageSentOfonoSpy.count(), 1);
+    QCOMPARE(messageSentMultimediaSpy.count(), 0);
+
+    sentMessage = messageSentOfonoSpy.first().first().toString();
+    messageProperties = messageSentOfonoSpy.first().last().value<QVariantMap>();
+    QCOMPARE(sentMessage, message);
+    QCOMPARE(messageProperties["Recipients"].value<QStringList>().count(), 1);
+    QCOMPARE(messageProperties["Recipients"].value<QStringList>().first(), recipient);
+}
+
 void HandlerTest::registerApprover()
 {
     // register the approver

=== modified file 'tests/handler/handlercontroller.cpp'
--- tests/handler/handlercontroller.cpp	2015-08-09 03:49:08 +0000
+++ tests/handler/handlercontroller.cpp	2015-12-09 13:28:53 +0000
@@ -73,6 +73,11 @@
     return map["CallIndicatorVisible"].toBool();
 }
 
+void HandlerController::startChat(const QString &accountId, const QStringList &recipients)
+{
+    mHandlerInterface.call("StartChat", accountId, recipients);
+}
+
 void HandlerController::startCall(const QString &number, const QString &accountId)
 {
     mHandlerInterface.call("StartCall", number, accountId);
@@ -124,9 +129,13 @@
     mHandlerInterface.call("SplitCall", objectPath);
 }
 
-void HandlerController::sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments, const QVariantMap &properties)
+QString HandlerController::sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments, const QVariantMap &properties)
 {
-    mHandlerInterface.call("SendMessage", accountId, recipients, message, QVariant::fromValue(attachments), properties);
+    QDBusReply<QString> reply = mHandlerInterface.call("SendMessage", accountId, recipients, message, QVariant::fromValue(attachments), properties);
+    if (reply.isValid()) {
+        return reply.value();
+    }
+    return QString();
 }
 
 void HandlerController::acknowledgeMessages(const QString &number, const QStringList &messageIds, const QString &accountId)

=== modified file 'tests/handler/handlercontroller.h'
--- tests/handler/handlercontroller.h	2015-08-09 03:49:08 +0000
+++ tests/handler/handlercontroller.h	2015-12-09 13:28:53 +0000
@@ -36,6 +36,7 @@
 
 public Q_SLOTS:
     // call methods
+    void startChat(const QString &accountId, const QStringList &recipients);
     void startCall(const QString &number, const QString &accountId);
     void hangUpCall(const QString &objectPath);
     void setHold(const QString &objectPath, bool hold);
@@ -50,7 +51,7 @@
     void splitCall(const QString &objectPath);
 
     // messaging methods
-    void sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments = AttachmentList(), const QVariantMap &properties = QVariantMap());
+    QString sendMessage(const QString &accountId, const QStringList &recipients, const QString &message, const AttachmentList &attachments = AttachmentList(), const QVariantMap &properties = QVariantMap());
     void acknowledgeMessages(const QString &number, const QStringList &messageIds, const QString &accountId);
 
     // active call indicator

=== modified file 'tests/libtelephonyservice/ChatManagerTest.cpp'
--- tests/libtelephonyservice/ChatManagerTest.cpp	2015-11-17 14:30:19 +0000
+++ tests/libtelephonyservice/ChatManagerTest.cpp	2015-12-09 13:28:53 +0000
@@ -101,14 +101,14 @@
     qSort(recipients);
 
     MockController *controller = accountId.startsWith("mock/mock") ? mGenericMockController : mPhoneMockController;
-    QSignalSpy controllerMessageSentSpy(controller, SIGNAL(MessageSent(QString,QVariantMap)));
+    QSignalSpy controllerMessageSentSpy(controller, SIGNAL(MessageSent(QString,QVariantList,QVariantMap)));
     QSignalSpy messageSentSpy(ChatManager::instance(), SIGNAL(messageSent(QStringList,QString)));
 
     ChatManager::instance()->sendMessage(accountId, recipients, message);
 
     TRY_COMPARE(controllerMessageSentSpy.count(), 1);
     QString messageText = controllerMessageSentSpy.first()[0].toString();
-    QVariantMap messageProperties = controllerMessageSentSpy.first()[1].toMap();
+    QVariantMap messageProperties = controllerMessageSentSpy.first()[2].toMap();
     QStringList messageRecipients = messageProperties["Recipients"].toStringList();
     qSort(messageRecipients);
     QCOMPARE(messageText, message);
@@ -218,7 +218,7 @@
 
     MockController *controller = accountId.startsWith("mock/mock") ? mGenericMockController : mPhoneMockController;
 
-    QSignalSpy controllerMessageSentSpy(controller, SIGNAL(MessageSent(QString,QVariantMap)));
+    QSignalSpy controllerMessageSentSpy(controller, SIGNAL(MessageSent(QString,QVariantList,QVariantMap)));
 
     QVariantList attachmentList;
     QVariantList attachment;
@@ -230,7 +230,7 @@
 
     TRY_COMPARE(controllerMessageSentSpy.count(), 1);
     QString messageText = controllerMessageSentSpy.first()[0].toString();
-    QVariantMap messageProperties = controllerMessageSentSpy.first()[1].toMap();
+    QVariantMap messageProperties = controllerMessageSentSpy.first()[2].toMap();
     QStringList messageRecipients = messageProperties["Recipients"].toStringList();
     qSort(messageRecipients);
     QCOMPARE(messageText, message);

=== modified file 'tests/libtelephonyservice/ProtocolTest.cpp'
--- tests/libtelephonyservice/ProtocolTest.cpp	2015-06-10 22:04:22 +0000
+++ tests/libtelephonyservice/ProtocolTest.cpp	2015-12-09 13:28:53 +0000
@@ -27,8 +27,8 @@
 {
     Q_OBJECT
 public:
-    TestProtocol(const QString &name, Protocol::Features features, const QString &fallbackProtocol, QObject *parent = 0)
-     : Protocol(name, features, fallbackProtocol, parent) { }
+    TestProtocol(const QString &name, Protocol::Features features, const QString &fallbackProtocol, const QString &backgroundFile, const QString &icon, const QString &serviceName = QString::null, QObject *parent = 0)
+     : Protocol(name, features, fallbackProtocol, backgroundFile, icon, serviceName, parent) { }
 };
 
 class ProtocolTest : public QObject
@@ -45,11 +45,17 @@
     QString name("foobar");
     Protocol::Features features(Protocol::TextChats);
     QString fallbackProtocol("theFallback");
+    QString backgroundImage("/tmp/background.png");
+    QString icon("/tmp/icon.png");
+    QString serviceName("The service");
 
-    TestProtocol protocol(name, features, fallbackProtocol, this);
+    TestProtocol protocol(name, features, fallbackProtocol, backgroundImage, icon, serviceName, this);
     QCOMPARE(protocol.name(), name);
     QCOMPARE(protocol.features(), features);
     QCOMPARE(protocol.fallbackProtocol(), fallbackProtocol);
+    QCOMPARE(protocol.backgroundImage(), backgroundImage);
+    QCOMPARE(protocol.icon(), icon);
+    QCOMPARE(protocol.serviceName(), serviceName);
     QCOMPARE(protocol.parent(), this);
 }
 
@@ -65,6 +71,9 @@
     QCOMPARE(protocol->name(), QString("foo"));
     QCOMPARE(protocol->features(), Protocol::Features(Protocol::TextChats | Protocol::VoiceCalls));
     QCOMPARE(protocol->fallbackProtocol(), QString("bar"));
+    QCOMPARE(protocol->backgroundImage(), QString("/tmp/background.png"));
+    QCOMPARE(protocol->icon(), QString("/tmp/icon.png"));
+    QCOMPARE(protocol->serviceName(), QString("The Service"));
 }
 
 QTEST_MAIN(ProtocolTest)

=== modified file 'tests/libtelephonyservice/testProtocols/foo.protocol'
--- tests/libtelephonyservice/testProtocols/foo.protocol	2015-06-10 22:04:22 +0000
+++ tests/libtelephonyservice/testProtocols/foo.protocol	2015-12-09 13:28:53 +0000
@@ -2,3 +2,6 @@
 Name=foo
 Features=text,voice
 FallbackProtocol=bar
+BackgroundImage=/tmp/background.png
+Icon=/tmp/icon.png
+ServiceName=The Service