mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-19 03:58:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Create a call session automatically when needed in the client group chat room.

Browse source
This commit is contained in:
Ghislain MARY 2017-10-04 14:24:55 +02:00
parent 6d11f76cc4
commit fda31ecc0e
5 changed files with 44 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/address/address.h
View file

@ -32,6 +32,7 @@ class LINPHONE_PUBLIC Address : public ClonableObject {
// TODO: Remove me later.
friend class CallSession;
friend class ClientGroupChatRoom;
friend class ClientGroupChatRoomPrivate;
public:
Address (const std::string &address = "");

4
src/chat/client-group-chat-room-p.h
View file

@ -29,11 +29,15 @@
LINPHONE_BEGIN_NAMESPACE
class CallSession;
class ClientGroupChatRoomPrivate : public ChatRoomPrivate {
public:
ClientGroupChatRoomPrivate (LinphoneCore *core);
virtual ~ClientGroupChatRoomPrivate () = default;
std::shared_ptr<CallSession> createSession ();
private:
L_DECLARE_PUBLIC(ClientGroupChatRoom);
};

55
src/chat/client-group-chat-room.cpp
View file

@ -34,6 +34,21 @@ LINPHONE_BEGIN_NAMESPACE
ClientGroupChatRoomPrivate::ClientGroupChatRoomPrivate (LinphoneCore *core)
: ChatRoomPrivate(core) {}
// -----------------------------------------------------------------------------
shared_ptr<CallSession> ClientGroupChatRoomPrivate::createSession () {
L_Q();
CallSessionParams csp;
csp.addCustomHeader("Require", "recipient-list-invite");
shared_ptr<CallSession> session = q->focus->getPrivate()->createSession(*q, &csp, false, q);
session->configure(LinphoneCallOutgoing, nullptr, nullptr, q->me->getAddress(), q->focus->getAddress());
session->initiateOutgoing();
Address addr = q->me->getAddress();
addr.setParam("text");
session->getPrivate()->getOp()->set_contact_address(addr.getPrivate()->getInternalAddress());
return session;
}
// =============================================================================
ClientGroupChatRoom::ClientGroupChatRoom (LinphoneCore *core, const Address &me, const string &subject)
@ -55,28 +70,27 @@ void ClientGroupChatRoom::addParticipants (const list<Address> &addresses, const
L_D();
if (addresses.empty())
return;
if ((d->state != ChatRoom::State::Instantiated) && (d->state != ChatRoom::State::Created)) {
lError() << "Cannot add participants to the ClientGroupChatRoom in a state other than Instantiated or Created";
return;
}
list<Address> sortedAddresses(addresses);
sortedAddresses.sort();
sortedAddresses.unique();
if (d->state == ChatRoom::State::Instantiated) {
Content content;
content.setBody(getResourceLists(sortedAddresses));
content.setContentType("application/resource-lists+xml");
content.setContentDisposition("recipient-list");
CallSessionParams csp;
if (params)
csp = *params;
csp.addCustomHeader("Require", "recipient-list-invite");
shared_ptr<CallSession> session = focus->getPrivate()->createSession(*this, &csp, false, this);
session->configure(LinphoneCallOutgoing, nullptr, nullptr, me->getAddress(), focus->getAddress());
session->initiateOutgoing();
Address addr = me->getAddress();
addr.setParam("text");
session->getPrivate()->getOp()->set_contact_address(addr.getPrivate()->getInternalAddress());
Content content;
content.setBody(getResourceLists(sortedAddresses));
content.setContentType("application/resource-lists+xml");
content.setContentDisposition("recipient-list");
shared_ptr<CallSession> session = focus->getPrivate()->getSession();
if (session)
session->update(nullptr, subject, &content);
else {
session = d->createSession();
session->startInvite(nullptr, subject, &content);
d->setState(ChatRoom::State::CreationPending);
if (d->state == ChatRoom::State::Instantiated) {
d->setState(ChatRoom::State::CreationPending);
}
}
// TODO
}
bool ClientGroupChatRoom::canHandleParticipants () const {
@ -118,7 +132,12 @@ void ClientGroupChatRoom::setSubject (const string &subject) {
return;
}
shared_ptr<CallSession> session = focus->getPrivate()->getSession();
session->update(nullptr, subject);
if (session)
session->update(nullptr, subject);
else {
session = d->createSession();
session->startInvite(nullptr, subject, nullptr);
}
}
// -----------------------------------------------------------------------------

1
src/conference/participant.h
View file

@ -35,6 +35,7 @@ class Participant : public Object {
friend class Call;
friend class CallPrivate;
friend class ClientGroupChatRoom;
friend class ClientGroupChatRoomPrivate;
friend class LocalConference;
friend class MediaSessionPrivate;
friend class RemoteConference;

1
src/conference/session/call-session.h
View file

@ -37,6 +37,7 @@ class Content;
class LINPHONE_PUBLIC CallSession : public Object {
friend class CallPrivate;
friend class ClientGroupChatRoom;
friend class ClientGroupChatRoomPrivate;
public:
L_OVERRIDE_SHARED_FROM_THIS(CallSession);