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

[Gustavo Pichorim Boiko]

Plug the room interface when necessary.

Plug the room interface when necessary.

[Roberto Mier Escandon (rmescandon)]

lgtm

review: Approve

=== modified file 'connection.cpp'
--- connection.cpp	2016-10-17 15:17:18 +0000
+++ connection.cpp	2016-10-28 02:48:59 +0000
@@ -747,7 +747,7 @@
     uint targetHandleType = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType")).toUInt();
     uint targetHandle = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle")).toUInt();
     QString targetId = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID")).toString();
-    bool isRoom = request.contains(TP_QT_IFACE_CHANNEL_INTERFACE_ROOM + ".RoomName");
+    bool isRoom = request.contains(TP_QT_IFACE_CHANNEL_INTERFACE_ROOM + QLatin1String(".RoomName"));
 
     if (mSelfPresence.type != Tp::ConnectionPresenceTypeAvailable) {
         error->set(TP_QT_ERROR_NETWORK_ERROR, "No network available");
 
=== modified file 'ofonotextchannel.cpp'
--- ofonotextchannel.cpp	2016-10-20 23:12:23 +0000
+++ ofonotextchannel.cpp	2016-10-28 02:48:59 +0000
@@ -108,8 +108,10 @@
     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
+    if (mmsGroupChat) {
+        mRoomIface = Tp::BaseChannelRoomInterface::create("", "", "", 0, QDateTime());
+        baseChannel->plugInterface(Tp::AbstractChannelInterfacePtr::dynamicCast(mRoomIface));
+    }
 
     mBaseChannel = baseChannel;
     mTextChannel = Tp::BaseChannelTextTypePtr::dynamicCast(mBaseChannel->interface(TP_QT_IFACE_CHANNEL_TYPE_TEXT));
 
=== modified file 'ofonotextchannel.h'
--- ofonotextchannel.h	2016-10-20 23:12:23 +0000
+++ ofonotextchannel.h	2016-10-28 02:48:59 +0000
@@ -66,6 +66,7 @@
     Tp::BaseChannelMessagesInterfacePtr mMessagesIface;
     Tp::BaseChannelGroupInterfacePtr mGroupIface;
     Tp::BaseChannelSMSInterfacePtr mSMSIface;
+    Tp::BaseChannelRoomInterfacePtr mRoomIface;
     Tp::BaseChannelTextTypePtr mTextChannel;
     uint mMessageCounter;
     QMap<QString, uint> mPendingDeliveryReportTemporarilyFailed;