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

better managament of content

Browse source
This commit is contained in:
Benjamin Reis 2018-03-23 15:03:08 +01:00
parent 70ea833a01
commit ba7278f5b5
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/conference/handlers/local-conference-list-event-handler.cpp
View file

@ -74,8 +74,8 @@ void LocalConferenceListEventHandler::subscribeReceived (LinphoneEvent *lev, con
bctbx_free(deviceAddrStr);
list<Content *> contents;
Content rlmiContent;
rlmiContent.setContentType(ContentType::Rlmi);
Content *rlmiContent = new Content();
rlmiContent->setContentType(ContentType::Rlmi);
// Create Rlmi body
Xsd::Rlmi::List::ResourceSequence resources;
@ -122,19 +122,19 @@ void LocalConferenceListEventHandler::subscribeReceived (LinphoneEvent *lev, con
device->setConferenceSubscribeEvent((subscriptionState == LinphoneSubscriptionIncomingReceived) ? lev : nullptr);
noContent = false;
Content content;
Content *content = new Content();
if (notifyId > 0) {
ContentType contentType(ContentType::Multipart);
contentType.addParameter("boundary", string(MultipartBoundary));
content.setContentType(contentType);
content->setContentType(contentType);
} else
content.setContentType(ContentType::ConferenceInfo);
content->setContentType(ContentType::ConferenceInfo);
content.setBody(notifyBody);
content->setBody(notifyBody);
char token[17];
belle_sip_random_token(token, sizeof(token));
content.addHeader("Content-Id", token);
contents.push_back(&content);
content->addHeader("Content-Id", token);
contents.push_back(content);
// Add entry into the Rlmi content of the notify body
Xsd::Rlmi::Resource resource(addr.asStringUriOnly());
@ -157,13 +157,14 @@ void LocalConferenceListEventHandler::subscribeReceived (LinphoneEvent *lev, con
Xsd::XmlSchema::NamespaceInfomap map;
stringstream rlmiBody;
Xsd::Rlmi::serializeList(rlmiBody, list, map);
rlmiContent.setBody(rlmiBody.str());
rlmiContent->setBody(rlmiBody.str());
contents.push_front(&rlmiContent);
contents.push_front(rlmiContent);
Content multipart = ContentManager::contentListToMultipart(contents, MultipartBoundaryListEventHandler);
LinphoneContent *cContent = L_GET_C_BACK_PTR(&multipart);
linphone_event_notify(lev, cContent);
linphone_content_unref(cContent);
contents.clear();
}
// -----------------------------------------------------------------------------