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

fix(content-manager): set correctly multi part content

Browse source
This commit is contained in:
Ronan Abhamon 2017-11-22 17:24:20 +01:00
parent 9d5d9ffc28
commit 7148e56f7c
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/content/content-manager.cpp
View file

@ -68,8 +68,6 @@ list<Content> ContentManager::multipartToContentList (const Content &content) {
}
Content ContentManager::contentListToMultipart (const list<Content> &contents) {
string sub;
belle_sip_memory_body_handler_t *mbh = nullptr;
belle_sip_multipart_body_handler_t *mpbh = belle_sip_multipart_body_handler_new(
nullptr, nullptr, nullptr, MULTIPART_BOUNDARY
@ -79,8 +77,7 @@ Content ContentManager::contentListToMultipart (const list<Content> &contents) {
for (const auto &content : contents) {
const ContentType &contentType = content.getContentType();
stringstream subtype;
sub = contentType.getSubType();
subtype << sub << "; charset=\"UTF-8\"";
subtype << contentType.getSubType() << "; charset=\"UTF-8\"";
belle_sip_header_t *cContentType = BELLE_SIP_HEADER(
belle_sip_header_content_type_create(
contentType.getType().c_str(),
@ -99,7 +96,7 @@ Content ContentManager::contentListToMultipart (const list<Content> &contents) {
Content content;
content.setBody(desc);
content.setContentType(ContentType("application", sub));
content.setContentType(ContentType::Multipart);
belle_sip_free(desc);
belle_sip_object_unref(mpbh);

3
src/content/content-type.cpp
View file

@ -39,15 +39,16 @@ public:
// -----------------------------------------------------------------------------
const ContentType ContentType::ConferenceInfo("application/conference-info+xml");
const ContentType ContentType::Cpim("message/cpim");
const ContentType ContentType::ExternalBody("message/external-body");
const ContentType ContentType::FileTransfer("application/vnd.gsma.rcs-ft-http+xml");
const ContentType ContentType::Imdn("message/imdn+xml");
const ContentType ContentType::ImIsComposing("application/im-iscomposing+xml");
const ContentType ContentType::Multipart("multipart/mixed");
const ContentType ContentType::PlainText("text/plain");
const ContentType ContentType::ResourceLists("application/resource-lists+xml");
const ContentType ContentType::Sdp("application/sdp");
const ContentType ContentType::ConferenceInfo("application/conference-info+xml");
// -----------------------------------------------------------------------------

3
src/content/content-type.h
View file

@ -61,15 +61,16 @@ public:
static bool isFile (const ContentType &contentType);
static const ContentType ConferenceInfo;
static const ContentType Cpim;
static const ContentType ExternalBody;
static const ContentType FileTransfer;
static const ContentType Imdn;
static const ContentType ImIsComposing;
static const ContentType Multipart;
static const ContentType PlainText;
static const ContentType ResourceLists;
static const ContentType Sdp;
static const ContentType ConferenceInfo;
private:
L_DECLARE_PRIVATE(ContentType);