telepathy-ofono

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

  1. more_mms_group_fixes
  2. Merge into staging
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Roberto Mier Escandon
Approved revision: 180
Merged at revision: 180
Proposed branch: lp:~phablet-team/telepathy-ofono/more_mms_group_fixes
Merge into: lp:telepathy-ofono/staging
Diff against target: 41 lines (+6/-3)
3 files modified
connection.cpp (+1/-1)
ofonotextchannel.cpp (+4/-2)
ofonotextchannel.h (+1/-0)
To merge this branch: bzr merge lp:~phablet-team/telepathy-ofono/more_mms_group_fixes
Reviewer Review Type Date Requested Status
Roberto Mier Escandon (community) Approve
Review via email: mp+309525@code.launchpad.net

This proposal supersedes a proposal from 2016-10-28.

Commit message

Plug the room interface when necessary.

Description of the change

Plug the room interface when necessary.

To post a comment you must log in.
Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'connection.cpp'
2--- connection.cpp 2016-10-17 15:17:18 +0000
3+++ connection.cpp 2016-10-28 02:48:59 +0000
4@@ -747,7 +747,7 @@
5 uint targetHandleType = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType")).toUInt();
6 uint targetHandle = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle")).toUInt();
7 QString targetId = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID")).toString();
8- bool isRoom = request.contains(TP_QT_IFACE_CHANNEL_INTERFACE_ROOM + ".RoomName");
9+ bool isRoom = request.contains(TP_QT_IFACE_CHANNEL_INTERFACE_ROOM + QLatin1String(".RoomName"));
10
11 if (mSelfPresence.type != Tp::ConnectionPresenceTypeAvailable) {
12 error->set(TP_QT_ERROR_NETWORK_ERROR, "No network available");
13
14=== modified file 'ofonotextchannel.cpp'
15--- ofonotextchannel.cpp 2016-10-20 23:12:23 +0000
16+++ ofonotextchannel.cpp 2016-10-28 02:48:59 +0000
17@@ -108,8 +108,10 @@
18 mSMSIface = Tp::BaseChannelSMSInterface::create(flash, true);
19 baseChannel->plugInterface(Tp::AbstractChannelInterfacePtr::dynamicCast(mSMSIface));
20
21- // FIXME(MMSGroup): create and plug the Room interface, and maybe the subject or the
22- // roomconfig interface for the subject
23+ if (mmsGroupChat) {
24+ mRoomIface = Tp::BaseChannelRoomInterface::create("", "", "", 0, QDateTime());
25+ baseChannel->plugInterface(Tp::AbstractChannelInterfacePtr::dynamicCast(mRoomIface));
26+ }
27
28 mBaseChannel = baseChannel;
29 mTextChannel = Tp::BaseChannelTextTypePtr::dynamicCast(mBaseChannel->interface(TP_QT_IFACE_CHANNEL_TYPE_TEXT));
30
31=== modified file 'ofonotextchannel.h'
32--- ofonotextchannel.h 2016-10-20 23:12:23 +0000
33+++ ofonotextchannel.h 2016-10-28 02:48:59 +0000
34@@ -66,6 +66,7 @@
35 Tp::BaseChannelMessagesInterfacePtr mMessagesIface;
36 Tp::BaseChannelGroupInterfacePtr mGroupIface;
37 Tp::BaseChannelSMSInterfacePtr mSMSIface;
38+ Tp::BaseChannelRoomInterfacePtr mRoomIface;
39 Tp::BaseChannelTextTypePtr mTextChannel;
40 uint mMessageCounter;
41 QMap<QString, uint> mPendingDeliveryReportTemporarilyFailed;

Subscribers

People subscribed via source and target branches

to all changes: