Merge lp:~phablet-team/telepathy-ofono/mms_group_as_room into lp:telepathy-ofono/staging

[Gustavo Pichorim Boiko]

Implement MMS groups as Room channels.

Implement MMS groups as Room channels.

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

[Tiago Salem Herrmann (tiagosh)]

looks good to me too.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-07-20 19:38:54 +0000
+++ CMakeLists.txt	2016-10-21 08:03:20 +0000
@@ -33,6 +33,7 @@
 find_package(LibPhoneNumber REQUIRED)
 find_package(Qt5Core)
 find_package(Qt5DBus)
+find_package(Qt5Network)
 add_definitions(-DQT_NO_KEYWORDS)
 
 find_package(PkgConfig REQUIRED)
@@ -93,6 +94,7 @@
    mmsdmanager.cpp
    mmsdservice.cpp
    mmsdmessage.cpp
+   mmsgroupcache.cpp
    pendingmessagesmanager.cpp
    phoneutils.cpp
    powerdaudiomodemediator.cpp
@@ -111,7 +113,7 @@
 
 enable_testing()
 
-target_link_libraries(${TELEPATHY_OFONO} ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} ${WAUDIO_LIBRARIES} -ltelepathy-qt5 ${TELEPATHY_QT5_SERVICE_LIBRARIES} ${OFONO_QT_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${SQLITE3_LIBRARIES} ${LibPhoneNumber_LIBRARIES})
+target_link_libraries(${TELEPATHY_OFONO} ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} ${WAUDIO_LIBRARIES} -ltelepathy-qt5 ${TELEPATHY_QT5_SERVICE_LIBRARIES}  ${Qt5Network_LIBRARIES} ${OFONO_QT_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${SQLITE3_LIBRARIES} ${LibPhoneNumber_LIBRARIES})
 install(TARGETS ${TELEPATHY_OFONO} DESTINATION ${DAEMON_DIR})
 
 configure_file(ofono.service.in org.freedesktop.Telepathy.ConnectionManager.ofono.service)

=== modified file 'connection.cpp'
--- connection.cpp	2016-10-21 08:03:20 +0000
+++ connection.cpp	2016-10-21 08:03:20 +0000
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2016 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -32,6 +32,7 @@
 
 #include "mmsdmessage.h"
 #include "mmsdservice.h"
+#include "mmsgroupcache.h"
 
 #ifdef USE_PULSEAUDIO
 #include "qpulseaudioengine.h"
@@ -83,6 +84,7 @@
     Tp::BaseConnection(dbusConnection, cmName, protocolName, parameters),
     mOfonoModemManager(new OfonoModemManager(this)),
     mHandleCount(0),
+    mGroupHandleCount(0),
     mMmsdManager(new MMSDManager(this)),
     mConferenceCall(NULL)
 {
@@ -125,6 +127,19 @@
     text.allowedProperties.append(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeHandles"));
     text.allowedProperties.append(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeIDs"));
 
+    Tp::RequestableChannelClass existingGroupChat;
+    existingGroupChat.fixedProperties[TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType")] = TP_QT_IFACE_CHANNEL_TYPE_TEXT;
+    existingGroupChat.fixedProperties[TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType")]  = Tp::HandleTypeRoom;
+    existingGroupChat.allowedProperties.append(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"));
+    existingGroupChat.allowedProperties.append(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"));
+
+    Tp::RequestableChannelClass newGroupChat;
+    newGroupChat.fixedProperties[TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType")] = TP_QT_IFACE_CHANNEL_TYPE_TEXT;
+    newGroupChat.fixedProperties[TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType")]  = Tp::HandleTypeNone;
+    newGroupChat.allowedProperties.append(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeHandles"));
+    newGroupChat.allowedProperties.append(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeIDs"));
+    newGroupChat.allowedProperties.append(TP_QT_IFACE_CHANNEL_INTERFACE_ROOM + QLatin1String(".RoomName"));
+
     // set requestable call channel properties
     Tp::RequestableChannelClass call;
     call.fixedProperties[TP_QT_IFACE_CHANNEL+".ChannelType"] = TP_QT_IFACE_CHANNEL_TYPE_CALL;
@@ -140,7 +155,7 @@
     call.allowedProperties.append(TP_QT_IFACE_CHANNEL_TYPE_CALL+".HardwareStreaming");
     call.allowedProperties.append(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialChannels"));
 
-    requestsIface->requestableChannelClasses << text << call;
+    requestsIface->requestableChannelClasses << text << call << existingGroupChat << newGroupChat;
 
     plugInterface(Tp::AbstractConnectionInterfacePtr::dynamicCast(requestsIface));
 
@@ -368,6 +383,16 @@
     qDebug() << "oFonoConnection::onMMSServiceRemoved" << path;
 }
 
+oFonoTextChannel* oFonoConnection::textChannelForId(const QString &id)
+{
+    Q_FOREACH(oFonoTextChannel* channel, mTextChannels) {
+        if (channel->baseChannel()->targetID() == id) {
+            return channel;
+        }
+    }
+    return NULL;
+}
+
 oFonoTextChannel* oFonoConnection::textChannelForMembers(const QStringList &members)
 {
     Q_FOREACH(oFonoTextChannel* channel, mTextChannels) {
@@ -398,6 +423,7 @@
 void oFonoConnection::addMMSToService(const QString &path, const QVariantMap &properties, const QString &servicePath)
 {
     qDebug() << "addMMSToService " << path << properties << servicePath;
+    bool isRoom = false;
     MMSDMessage *msg = new MMSDMessage(path, properties);
     mServiceMMSList[servicePath].append(msg);
     if (properties["Status"] ==  "received") {
@@ -409,6 +435,7 @@
         // remove empty strings if any
         recipientList.removeAll("");
         if (recipientList.size() > 1) {
+            isRoom = true;
             // remove ourselves from the recipient list 
             Q_FOREACH(const QString &myNumber, mOfonoSimManager->subscriberNumbers()) {
                 Q_FOREACH(const QString &remoteNumber, recipientList) {
@@ -428,8 +455,19 @@
             senderNormalizedNumber = "x-ofono-unknown";
         }
 
-        // check if there is an open channel for this number and use it
-        oFonoTextChannel *channel = textChannelForMembers(QStringList() << senderNormalizedNumber << recipients.toList());
+        oFonoTextChannel *channel = NULL;
+        MMSGroup group;
+        if (isRoom) {
+            group = MMSGroupCache::existingGroup(QStringList() << senderNormalizedNumber << recipients.toList());
+            if (!group.groupId.isEmpty()) {
+                // check if there is an open channel for this group and use it
+                channel = textChannelForId(group.groupId);
+            }
+        } else {
+            // check if there is an open channel for these numbers and use it (1-1 chat here)
+            channel = textChannelForMembers(QStringList() << senderNormalizedNumber << recipients.toList());
+        }
+        
         if (channel) {
             channel->mmsReceived(path, ensureHandle(senderNormalizedNumber), properties);
             return;
@@ -445,8 +483,13 @@
         request[TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType")] = TP_QT_IFACE_CHANNEL_TYPE_TEXT;
         request[TP_QT_IFACE_CHANNEL + QLatin1String(".InitiatorHandle")] = handle;
 
-        if (initialInviteeHandles.size() > 0) {
+        if (isRoom) {
             initialInviteeHandles << handle;
+            request[TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType")] = Tp::HandleTypeRoom;
+            // if the group exists, fill the targetId with the existing id
+            if (!group.groupId.isEmpty()) {
+                request[TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID")] = group.groupId;
+            }
             request[TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeHandles")] = QVariant::fromValue(initialInviteeHandles);
             ensureChannel(request, yours, false, &error);
         } else {
@@ -455,13 +498,19 @@
             ensureChannel(request, yours, false, &error);
         }
 
-        if(error.isValid()) {
+        if (error.isValid()) {
             qCritical() << "Error creating channel for incoming message " << error.name() << error.message();
             return;
         }
-        channel = textChannelForMembers(QStringList() << senderNormalizedNumber << recipients.toList());
+        if (isRoom) {
+            channel = textChannelForId(group.groupId);
+        } else {
+            channel = textChannelForMembers(QStringList() << senderNormalizedNumber << recipients.toList());
+        }
         if (channel) {
             channel->mmsReceived(path, handle, properties);
+        } else {
+            qCritical() << "Failed to create channel for incoming mms" << "isRoom" << isRoom << "groupId" << group.groupId;
         }
     }
 }
@@ -623,23 +672,42 @@
     return mHandleCount;
 }
 
+uint oFonoConnection::newGroupHandle(const QString &identifier)
+{
+    mGroupHandles[++mGroupHandleCount] = identifier;
+    return mGroupHandleCount;
+}
+
 QStringList oFonoConnection::inspectHandles(uint handleType, const Tp::UIntList& handles, Tp::DBusError *error)
 {
     QStringList identifiers;
 
-    if( handleType != Tp::HandleTypeContact ) {
+    switch (handleType) {
+    case Tp::HandleTypeContact:
+        qDebug() << "oFonoConnection::inspectHandles contact" << handles;
+        Q_FOREACH(uint handle, handles) {
+            if (mHandles.keys().contains(handle)) {
+                identifiers.append(mHandles.value(handle));
+            } else {
+                error->set(TP_QT_ERROR_INVALID_HANDLE, "Contact handle not found");
+                return QStringList();
+            }
+        }
+        break;
+    case Tp::HandleTypeRoom:
+        qDebug() << "oFonoConnection::inspectHandles group" << handles;
+        Q_FOREACH(uint handle, handles) {
+            if (mGroupHandles.keys().contains(handle)) {
+                identifiers.append(mGroupHandles.value(handle));
+            } else {
+                error->set(TP_QT_ERROR_INVALID_HANDLE, "Group handle not found");
+                return QStringList();
+            }
+        }
+        break;
+    default:
         error->set(TP_QT_ERROR_INVALID_ARGUMENT,"Not supported");
-        return QStringList();
-    }
-
-    qDebug() << "oFonoConnection::inspectHandles " << handles;
-    Q_FOREACH( uint handle, handles) {
-        if (mHandles.keys().contains(handle)) {
-            identifiers.append(mHandles.value(handle));
-        } else {
-            error->set(TP_QT_ERROR_INVALID_HANDLE, "Handle not found");
-            return QStringList();
-        }
+        break;
     }
     qDebug() << "oFonoConnection::inspectHandles " << identifiers;
     return identifiers;
@@ -676,18 +744,16 @@
 
 Tp::BaseChannelPtr oFonoConnection::createTextChannel(const QVariantMap &request, Tp::DBusError *error)
 {
+    uint targetHandleType = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType")).toUInt();
     uint targetHandle = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle")).toUInt();
-    const QString targetId = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID")).toString();
+    QString targetId = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID")).toString();
+    bool isRoom = request.contains(TP_QT_IFACE_CHANNEL_INTERFACE_ROOM + ".RoomName");
 
     if (mSelfPresence.type != Tp::ConnectionPresenceTypeAvailable) {
         error->set(TP_QT_ERROR_NETWORK_ERROR, "No network available");
         return Tp::BaseChannelPtr();
     }
 
-    if (!targetId.isEmpty()) {
-        targetHandle = ensureHandle(targetId);
-    }
-
     QStringList phoneNumbers;
     bool flash = false;
     if (request.contains(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeIDs"))) {
@@ -699,15 +765,63 @@
         phoneNumbers << inspectHandles(Tp::HandleTypeContact, handles, error);
     } else if (request.contains(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeHandles"))) {
         phoneNumbers << inspectHandles(Tp::HandleTypeContact, qdbus_cast<Tp::UIntList>(request[TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeHandles")]), error);
-    } else {
-        phoneNumbers << mHandles.value(targetHandle);
+    };
+
+    // if the handle type is none and RoomName is present, we should try to find an existing MMS group
+    if (targetHandleType == Tp::HandleTypeNone && isRoom) {
+        MMSGroup group = MMSGroupCache::existingGroup(phoneNumbers);
+        if (!group.groupId.isEmpty()) {
+            targetId = group.groupId;
+            targetHandleType = Tp::HandleTypeRoom;
+        }
+    } else if (targetHandleType == Tp::HandleTypeRoom) {
+        if (targetId.isEmpty()) {
+            targetId = mGroupHandles.value(targetHandle);
+        }
+        // we got the groupId, now lookup the members and subject in the cache
+        MMSGroup group = MMSGroupCache::existingGroup(targetId);
+        if (group.groupId.isEmpty()) {
+            error->set(TP_QT_ERROR_INVALID_HANDLE, "MMS Group not found in cache.");
+            return Tp::BaseChannelPtr();
+        }
+        phoneNumbers = group.members;
+        isRoom = true;
+        // FIXME(MMSGroup): add support for MMS group subject
+    } else if (targetHandleType == Tp::HandleTypeContact && targetHandle != 0) {
+        targetId = mHandles.value(targetHandle);
+    }
+
+    // now get the appropriate handle
+    if (!targetId.isEmpty()) {
+        switch (targetHandleType) {
+        case Tp::HandleTypeRoom:
+            targetHandle = ensureGroupHandle(targetId);
+            break;
+        case Tp::HandleTypeContact:
+        default:
+            targetHandle = ensureHandle(targetId);
+            phoneNumbers << mHandles.value(targetHandle);
+            break;
+        }
     }
 
     if (request.contains(TP_QT_IFACE_CHANNEL_INTERFACE_SMS + QLatin1String(".Flash"))) {
         flash = request[TP_QT_IFACE_CHANNEL_INTERFACE_SMS + QLatin1String(".Flash")].toBool();
     }
 
-    oFonoTextChannel *channel = new oFonoTextChannel(this, phoneNumbers, flash);
+    oFonoTextChannel *channel = 0;
+    if (isRoom) {
+        // FIXME(MMSGroup): if targetId is empty, this means this is a new group, so we need to
+        // generate the group ID, probably something like "mms:<hash of member IDs>".
+        // Also, we need to call MMSGroupCache::saveGroup() to save the group in the cache
+        MMSGroup group;
+        group.groupId = MMSGroupCache::generateId(phoneNumbers);
+        group.members = phoneNumbers;
+        MMSGroupCache::saveGroup(group);
+        channel = new oFonoTextChannel(this, targetId, phoneNumbers);
+    } else {
+        channel = new oFonoTextChannel(this, QString(), phoneNumbers, flash);
+    }
     mTextChannels << channel;
     QObject::connect(channel, SIGNAL(messageRead(QString)), SLOT(onMessageRead(QString)));
     QObject::connect(channel, SIGNAL(destroyed()), SLOT(onTextChannelClosed()));
@@ -1002,6 +1116,14 @@
     return newHandle(normalizedNumber);
 }
 
+uint oFonoConnection::ensureGroupHandle(const QString &groupId)
+{
+    if (mGroupHandles.values().contains(groupId)) {
+        return mGroupHandles.key(groupId);
+    }
+    return newGroupHandle(groupId);
+}
+
 bool oFonoConnection::matchChannel(const Tp::BaseChannelPtr &channel, const QVariantMap &request, Tp::DBusError *error)
 {
     QString channelType = request[TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType")].toString();

=== modified file 'connection.h'
--- connection.h	2015-08-10 21:06:36 +0000
+++ connection.h	2016-10-21 08:03:20 +0000
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2016 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Tiago Salem Herrmann <[e-mail]>
+ *          Gustavo Pichorim Boiko <[e-mail]>
  */
 
 #ifndef OFONOCONNECTION_H
@@ -94,6 +95,7 @@
     BaseConnectionVoicemailInterfacePtr voicemailIface;
     BaseConnectionUSSDInterfacePtr supplementaryServicesIface;
     uint newHandle(const QString &identifier);
+    uint newGroupHandle(const QString &identifier);
 
     OfonoMessageManager *messageManager();
     OfonoVoiceCallManager *voiceCallManager();
@@ -101,6 +103,8 @@
     QMap<QString, oFonoCallChannel*> callChannels();
 
     uint ensureHandle(const QString &phoneNumber);
+    uint ensureGroupHandle(const QString &groupId);
+    oFonoTextChannel* textChannelForId(const QString &id);
     oFonoTextChannel* textChannelForMembers(const QStringList &members);
     Tp::BaseChannelPtr createTextChannel(const QVariantMap &request, Tp::DBusError *error);
     Tp::BaseChannelPtr createCallChannel(const QVariantMap &request, Tp::DBusError *error);
@@ -159,6 +163,9 @@
     void addMMSToService(const QString &path, const QVariantMap &properties, const QString &servicePath);
     void ensureTextChannel(const QString &message, const QVariantMap &info, bool flash);
     QMap<uint, QString> mHandles;
+    uint mHandleCount;
+    QMap<uint, QString> mGroupHandles;
+    uint mGroupHandleCount;
 
 #ifdef USE_PULSEAUDIO
     bool mHasPulseAudio;
@@ -177,7 +184,6 @@
     OfonoSupplementaryServices *mOfonoSupplementaryServices;
     OfonoSimManager *mOfonoSimManager;
     OfonoModem *mOfonoModem;
-    uint mHandleCount;
     Tp::SimplePresence mSelfPresence;
     MMSDManager *mMmsdManager;
     QMap<QString, MMSDService*> mMmsdServices;

=== added file 'mmsgroupcache.cpp'
--- mmsgroupcache.cpp	1970-01-01 00:00:00 +0000
+++ mmsgroupcache.cpp	2016-10-21 08:03:20 +0000
@@ -0,0 +1,146 @@
+/**
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Gustavo Pichorim Boiko <[e-mail]>
+ */
+
+#include "mmsgroupcache.h"
+#include "phoneutils_p.h"
+#include "sqlitedatabase.h"
+#include <QSqlQuery>
+#include <QVariant>
+#include <QCryptographicHash>
+
+MMSGroupCache::MMSGroupCache(QObject *parent) : QObject(parent)
+{
+}
+
+MMSGroup MMSGroupCache::existingGroup(const QStringList &members)
+{
+    MMSGroup group;
+    if (members.isEmpty()) {
+        return group;
+    }
+
+    // try to find all the threads which at least the first member is part of
+    QString firstMember = members.first();
+    QSqlQuery query(SQLiteDatabase::instance()->database());
+    query.prepare("SELECT groupId FROM mms_group_members WHERE comparePhoneNumbers(memberId, :memberId)");
+    query.bindValue(":memberId", firstMember);
+    if (!query.exec()) {
+        return group;
+    }
+
+    QStringList groupIds;
+    while (query.next()) {
+        groupIds << query.value(0).toString();
+    }
+
+    // now get all the groups and see if any matches all the members
+    for (auto groupId : groupIds) {
+        query.prepare("SELECT memberId FROM mms_group_members WHERE groupId=:groupId");
+        query.bindValue(":groupId", groupId);
+        if (!query.exec()) {
+            return group;
+        }
+        QStringList groupMembers;
+        while (query.next()) {
+            groupMembers << query.value(0).toString();
+        }
+
+        // if the groups have a different number of members, they are certainly not the same
+        if (groupMembers.count() != members.count()) {
+            continue;
+        }
+
+        // compare the members to see if they match
+        int match = 0;
+        for (auto groupMember : groupMembers) {
+            for (auto member : members) {
+                if (PhoneUtils::comparePhoneNumbers(groupMember, member)) {
+                    match++;
+                    continue;
+                }
+            }
+        }
+        if (match == members.count()) {
+            query.prepare("SELECT subject FROM mms_groups WHERE groupId=:groupId");
+            query.bindValue(":groupId", groupId);
+            if (query.exec()) {
+                query.next();
+                group.subject = query.value(0).toString();
+            }
+            group.groupId = groupId;
+            group.members = groupMembers;
+            break;
+        }
+    }
+    return group;
+}
+
+MMSGroup MMSGroupCache::existingGroup(const QString &groupId)
+{
+    MMSGroup group;
+
+    // select the group to make sure it exists
+    QSqlQuery query(SQLiteDatabase::instance()->database());
+    query.prepare("SELECT subject FROM mms_groups WHERE groupId=:groupId");
+    query.bindValue(":groupId", groupId);
+    if (query.exec() && query.next()) {
+        group.groupId = groupId;
+        group.subject = query.value(0).toString();
+        query.prepare("SELECT memberId FROM mms_group_members WHERE groupId=:groupId");
+        query.bindValue(":groupId", groupId);
+        if (!query.exec()) {
+            return group;
+        }
+
+        while (query.next()) {
+            group.members << query.value(0).toString();
+        }
+    }
+
+    return group;
+}
+
+bool MMSGroupCache::saveGroup(const MMSGroup &group)
+{
+    SQLiteDatabase::instance()->beginTransation();
+
+    QSqlQuery query(SQLiteDatabase::instance()->database());
+    query.prepare("INSERT INTO mms_groups(groupId, subject) VALUES (:groupId, :subject)");
+    query.bindValue(":groupId", group.groupId);
+    query.bindValue(":subject", group.subject);
+    if (!query.exec()) {
+        SQLiteDatabase::instance()->rollbackTransaction();
+        return false;
+    }
+    for (auto member : group.members) {
+        query.prepare("INSERT INTO mms_group_members(groupId, memberId) VALUES(:groupId, :memberId)");
+        query.bindValue(":groupId", group.groupId);
+        query.bindValue(":memberId", member);
+        if (!query.exec()) {
+            SQLiteDatabase::instance()->rollbackTransaction();
+            return false;
+        }
+    }
+    SQLiteDatabase::instance()->finishTransaction();
+    return true;
+}
+
+QString MMSGroupCache::generateId(const QStringList &phoneNumbers)
+{
+    return QString("mms:%1").arg(QString(QCryptographicHash::hash(phoneNumbers.join(";").toLocal8Bit(),QCryptographicHash::Md5).toHex()));
+}

=== added file 'mmsgroupcache.h'
--- mmsgroupcache.h	1970-01-01 00:00:00 +0000
+++ mmsgroupcache.h	2016-10-21 08:03:20 +0000
@@ -0,0 +1,44 @@
+/**
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Gustavo Pichorim Boiko <[e-mail]>
+ */
+
+#ifndef MMSGROUPCACHE_H
+#define MMSGROUPCACHE_H
+
+#include <QObject>
+#include <QStringList>
+
+typedef struct {
+    QString groupId;
+    QString subject;
+    QStringList members;
+} MMSGroup;
+
+class MMSGroupCache : public QObject
+{
+    Q_OBJECT
+public:
+    static MMSGroup existingGroup(const QStringList &members);
+    static MMSGroup existingGroup(const QString &groupId);
+    static bool saveGroup(const MMSGroup &group);
+    static QString generateId(const QStringList &phoneNumbers);
+
+private:
+    explicit MMSGroupCache(QObject *parent = 0);
+};
+
+#endif // MMSGROUPCACHE_H

=== modified file 'ofonotextchannel.cpp'
--- ofonotextchannel.cpp	2015-08-11 14:01:52 +0000
+++ ofonotextchannel.cpp	2016-10-21 08:03:20 +0000
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2016 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Tiago Salem Herrmann <[e-mail]>
+ *          Gustavo Pichorim Boiko <[e-mail]>
  */
 
 // ofono-qt
@@ -40,7 +41,7 @@
 }
 
 
-oFonoTextChannel::oFonoTextChannel(oFonoConnection *conn, QStringList phoneNumbers, bool flash, QObject *parent):
+oFonoTextChannel::oFonoTextChannel(oFonoConnection *conn, const QString &targetId, QStringList phoneNumbers, bool flash, QObject *parent):
     QObject(parent),
     mConnection(conn),
     mPhoneNumbers(phoneNumbers),
@@ -49,14 +50,21 @@
 {
     qDBusRegisterMetaType<IncomingAttachmentStruct>();
     qDBusRegisterMetaType<IncomingAttachmentList>();
+    bool mmsGroupChat = !targetId.isEmpty();
 
     Tp::BaseChannelPtr baseChannel;
-    if (phoneNumbers.size() == 1) {
+    if (mmsGroupChat) {
+        baseChannel = Tp::BaseChannel::create(mConnection,
+                                              TP_QT_IFACE_CHANNEL_TYPE_TEXT,
+                                              Tp::HandleTypeRoom,
+                                              mConnection->ensureGroupHandle(targetId));
+    } else if (phoneNumbers.size() == 1) {
         baseChannel = Tp::BaseChannel::create(mConnection,
                                               TP_QT_IFACE_CHANNEL_TYPE_TEXT,
                                               Tp::HandleTypeContact,
                                               mConnection->ensureHandle(mPhoneNumbers[0]));
     } else {
+        // sms broadcast
         baseChannel = Tp::BaseChannel::create(mConnection,
                                               TP_QT_IFACE_CHANNEL_TYPE_TEXT);
     }
@@ -80,59 +88,54 @@
 
     baseChannel->plugInterface(Tp::AbstractChannelInterfacePtr::dynamicCast(mMessagesIface));
 
-    mGroupIface = Tp::BaseChannelGroupInterface::create(Tp::ChannelGroupFlagCanAdd, conn->selfHandle());
-    mGroupIface->setAddMembersCallback(Tp::memFun(this,&oFonoTextChannel::onAddMembers));
-    mGroupIface->setRemoveMembersCallback(Tp::memFun(this,&oFonoTextChannel::onRemoveMembers));
+    Tp::ChannelGroupFlags groupFlags = Tp::ChannelGroupFlagHandleOwnersNotAvailable |
+                                       Tp::ChannelGroupFlagMembersChangedDetailed |
+                                       Tp::ChannelGroupFlagProperties;
+
+    mGroupIface = Tp::BaseChannelGroupInterface::create(groupFlags, mConnection->selfHandle());
 
     baseChannel->plugInterface(Tp::AbstractChannelInterfacePtr::dynamicCast(mGroupIface));
-    addMembers(phoneNumbers);
+
+    Q_FOREACH(const QString &phoneNumber, phoneNumbers) {
+        uint handle = mConnection->ensureHandle(phoneNumber);
+        if (!mMembers.contains(handle)) {
+            mMembers << handle;
+        }
+    }
+
+    mGroupIface->addMembers(mMembers, phoneNumbers);
 
     mSMSIface = Tp::BaseChannelSMSInterface::create(flash, true);
     baseChannel->plugInterface(Tp::AbstractChannelInterfacePtr::dynamicCast(mSMSIface));
 
+    // FIXME(MMSGroup): create and plug the Room interface, and maybe the subject or the
+    // roomconfig interface for the subject
+
     mBaseChannel = baseChannel;
     mTextChannel = Tp::BaseChannelTextTypePtr::dynamicCast(mBaseChannel->interface(TP_QT_IFACE_CHANNEL_TYPE_TEXT));
     mTextChannel->setMessageAcknowledgedCallback(Tp::memFun(this,&oFonoTextChannel::messageAcknowledged));
     QObject::connect(mBaseChannel.data(), SIGNAL(closed()), this, SLOT(deleteLater()));
 }
 
-void oFonoTextChannel::onAddMembers(const Tp::UIntList& handles, const QString& message, Tp::DBusError* error)
-{
-    addMembers(mConnection->inspectHandles(Tp::HandleTypeContact, handles, error));
-}
-
-void oFonoTextChannel::onRemoveMembers(const Tp::UIntList& handles, const QString& message, Tp::DBusError* error)
-{
-    Q_FOREACH(uint handle, handles) {
-        Q_FOREACH(const QString &phoneNumber, mConnection->inspectHandles(Tp::HandleTypeContact, Tp::UIntList() << handle, error)) {
-            mPhoneNumbers.removeAll(phoneNumber);
-        }
-        mMembers.removeAll(handle);
-    }
-    mGroupIface->removeMembers(handles);
-}
-
-void oFonoTextChannel::addMembers(QStringList phoneNumbers)
-{
-    Tp::UIntList handles;
-    Q_FOREACH(const QString &phoneNumber, phoneNumbers) {
-        uint handle = mConnection->ensureHandle(phoneNumber);
-        handles << handle;
-        if (!mPhoneNumbers.contains(phoneNumber)) {
-            mPhoneNumbers << phoneNumber;
-        }
-        if (!mMembers.contains(handle)) {
-            mMembers << handle;
-        }
-    }
-    mGroupIface->addMembers(handles, phoneNumbers);
-}
-
 Tp::UIntList oFonoTextChannel::members()
 {
     return mMembers;
 }
 
+
+bool oFonoTextChannel::isMultiPartMessage(const Tp::MessagePartList &message) const
+{
+    // multi-part messages happen in two cases:
+    // - if it has more than two parts
+    // - if the second part (the first is the header) is not text
+    if (message.size() > 2 ||
+        (message.size() == 2 && !message[1]["content-type"].variant().toString().startsWith("text/"))) {
+        return true;
+    }
+
+    return false;
+}
+
 oFonoTextChannel::~oFonoTextChannel()
 {
     Q_FOREACH(const QStringList &fileList, mFilesToRemove) {
@@ -177,13 +180,14 @@
     Tp::MessagePart body = message.at(1);
     QString objpath;
 
-    bool mms = header["x-canonical-mms"].variant().toBool();
+    bool isRoom = baseChannel()->targetHandleType() == Tp::HandleTypeRoom;
+    bool isMMS = isRoom || isMultiPartMessage(message);
 
-    if (mms) {
+    // any mms, either 1-1, group or broadcast
+    if (isMMS || isRoom) {
         // pop header out
         message.removeFirst();
         OutgoingAttachmentList attachments;
-        // FIXME group chat
         QString phoneNumber = mPhoneNumbers[0];
         uint handle = mConnection->ensureHandle(phoneNumber);
         QStringList temporaryFiles;
@@ -218,6 +222,23 @@
             attachment.filePath = file.fileName();
             attachments << attachment;
         }
+        // if this is a broadcast, send multiple mms
+        if (!isRoom) {
+            // generate an id to this broadcast operation and its delivery reports
+            objpath = QDateTime::currentDateTimeUtc().toString(Qt::ISODate) + "-" + QString::number(mMessageCounter++);
+            Q_FOREACH(const QString &phoneNumber, mPhoneNumbers) {
+                QString realObjpath = mConnection->sendMMS(QStringList() << phoneNumber, attachments).path();
+                MMSDMessage *msg = new MMSDMessage(realObjpath, QVariantMap(), this);
+                QObject::connect(msg, SIGNAL(propertyChanged(QString,QVariant)), SLOT(onMMSPropertyChanged(QString,QVariant)));
+                mPendingBroadcastMMS[realObjpath] = objpath;
+                mPendingDeliveryReportUnknown[objpath] = handle;
+                QTimer::singleShot(0, this, SLOT(onProcessPendingDeliveryReport()));
+            }
+            if (temporaryFiles.size() > 0 && !mFilesToRemove.contains(objpath)) {
+                mFilesToRemove[objpath] = temporaryFiles;
+            }
+            return objpath;
+        }
         objpath = mConnection->sendMMS(mPhoneNumbers, attachments).path();
         if (objpath.isEmpty()) {
             Q_FOREACH(const QString& file, temporaryFiles) {
@@ -241,6 +262,7 @@
         return objpath;
     }
 
+    // 1-1 sms
     if (mPhoneNumbers.size() == 1) {
         QString phoneNumber = mPhoneNumbers[0];
         uint handle = mConnection->ensureHandle(phoneNumber);
@@ -270,13 +292,13 @@
         QObject::connect(msg, SIGNAL(stateChanged(QString)), SLOT(onOfonoMessageStateChanged(QString)));
         return objpath;
     } else {
+        // Broadcast sms
         bool someMessageSent = false;
         QString lastPhoneNumber;
         Q_FOREACH(const QString &phoneNumber, mPhoneNumbers) {
-            uint handle = mConnection->ensureHandle(mPhoneNumbers[0]);
             objpath = mConnection->messageManager()->sendMessage(phoneNumber, body["content"].variant().toString(), success).path();
             lastPhoneNumber = phoneNumber;
-            // dont fail if this is a group chat as we cannot track individual messages
+            // dont fail if this is a broadcast chat as we cannot track individual messages
             if (objpath.isEmpty() || !success) {
                 if (!success) {
                     qWarning() << mConnection->messageManager()->errorName() << mConnection->messageManager()->errorMessage();
@@ -313,12 +335,14 @@
 void oFonoTextChannel::onMMSPropertyChanged(QString property, QVariant value)
 {
     qDebug() << "oFonoTextChannel::onMMSPropertyChanged" << property << value;
+    bool canRemoveFiles = true;
     MMSDMessage *msg = qobject_cast<MMSDMessage*>(sender());
     // FIXME - mms groupchat
     uint handle = mConnection->ensureHandle(mPhoneNumbers[0]);
     if (!msg) {
         return;
     }
+    QString objectPath = msg->path();
     if (property == "Status") {
         Tp::DeliveryStatus status = Tp::DeliveryStatusUnknown;
         if (value == "Sent") {
@@ -331,11 +355,38 @@
             // while it is draft we dont actually send a delivery report
             return;
         }
-        Q_FOREACH(const QString& file, mFilesToRemove[msg->path()]) {
+        if (mPendingBroadcastMMS.contains(objectPath)) {
+            // if this is the last outstanding mms, we can now remove the files
+            objectPath = mPendingBroadcastMMS.take(objectPath);
+            QStringList originalObjPaths = mPendingBroadcastMMS.keys(objectPath);
+            canRemoveFiles = originalObjPaths.size() == 0;
+
+            if (status == Tp::DeliveryStatusAccepted) {
+                // if we get at least one sucess, we notify sucess no matter if the others fail
+                mPendingBroadcastFinalResult[objectPath] = true;
+            }
+
+            if (canRemoveFiles) {
+                if (mPendingBroadcastFinalResult[objectPath]) {
+                    status = Tp::DeliveryStatusAccepted;
+                } else {
+                    status = Tp::DeliveryStatusPermanentlyFailed;
+                }
+                Q_FOREACH(const QString& file, mFilesToRemove[objectPath]) {
+                    QFile::remove(file);
+                }
+                mFilesToRemove.remove(objectPath);
+                sendDeliveryReport(objectPath, handle, status);
+                mPendingBroadcastFinalResult.remove(objectPath);
+            }
+            return;
+        }
+
+        Q_FOREACH(const QString& file, mFilesToRemove[objectPath]) {
             QFile::remove(file);
         }
-        mFilesToRemove.remove(msg->path());
-        sendDeliveryReport(msg->path(), handle, status);
+        mFilesToRemove.remove(objectPath);
+        sendDeliveryReport(objectPath, handle, status);
     }
 }
 

=== modified file 'ofonotextchannel.h'
--- ofonotextchannel.h	2014-07-24 20:05:08 +0000
+++ ofonotextchannel.h	2016-10-21 08:03:20 +0000
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2016 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Tiago Salem Herrmann <[e-mail]>
+ *          Gustavo Pichorim Boiko <[e-mail]>
  */
 
 #ifndef OFONOTEXTCHANNEL_H
@@ -34,7 +35,9 @@
 {
     Q_OBJECT
 public:
-    oFonoTextChannel(oFonoConnection *conn, QStringList phoneNumbers, bool flash = false, QObject *parent = 0);
+    /** @brief Constructs a text channel to be used in 1-1 or SMS broadcast conversations */
+    oFonoTextChannel(oFonoConnection *conn, const QString &targetId, QStringList phoneNumbers, bool flash = false, QObject *parent = 0);
+
     QString sendMessage(Tp::MessagePartList message, uint flags, Tp::DBusError* error);
     void messageReceived(const QString & message, uint handle, const QVariantMap &info);
     Tp::BaseChannelPtr baseChannel();
@@ -42,10 +45,10 @@
     void mmsReceived(const QString &id, uint handle, const QVariantMap &properties);
     void deliveryReportReceived(const QString& messageId, uint handle, bool success);
     void sendDeliveryReport(const QString &messageId, uint handle, Tp::DeliveryStatus status);
-    void addMembers(QStringList phoneNumbers);
     Tp::UIntList members();
-    void onAddMembers(const Tp::UIntList& handles, const QString& message, Tp::DBusError* error);
-    void onRemoveMembers(const Tp::UIntList& handles, const QString& message, Tp::DBusError* error);
+
+protected:
+    bool isMultiPartMessage(const Tp::MessagePartList &message) const;
 
 private Q_SLOTS:
     void onMMSPropertyChanged(QString property, QVariant value);
@@ -70,6 +73,8 @@
     QMap<QString, uint> mPendingDeliveryReportAccepted;
     QMap<QString, uint> mPendingDeliveryReportDelivered;
     QMap<QString, uint> mPendingDeliveryReportUnknown;
+    QMap<QString, QString> mPendingBroadcastMMS;
+    QMap<QString, bool> mPendingBroadcastFinalResult;
     Tp::UIntList mMembers;
     QMap<QString, QStringList> mFilesToRemove;
     bool mFlash;

=== modified file 'schema/CMakeLists.txt'
--- schema/CMakeLists.txt	2013-12-11 14:52:03 +0000
+++ schema/CMakeLists.txt	2016-10-21 08:03:20 +0000
@@ -11,3 +11,6 @@
     )
 
 add_custom_target(schema_update DEPENDS ${SCHEMA_FILE} ${VERSION_FILE})
+
+# just to get the v*sql files to show on QtCreator
+add_custom_target(schema_files_target ALL SOURCES ${SCHEMA_FILES})

=== added file 'schema/v2.sql'
--- schema/v2.sql	1970-01-01 00:00:00 +0000
+++ schema/v2.sql	2016-10-21 08:03:20 +0000
@@ -0,0 +1,10 @@
+CREATE TABLE mms_groups (
+    groupId varchar(255) PRIMARY KEY,
+    subject varchar(512)
+);
+
+CREATE TABLE mms_group_members (
+    groupId varchar(255),
+    memberId varchar(255),
+    FOREIGN KEY(groupId) REFERENCES mms_groups(groupId)
+);