From 7148e56f7c92a653884e2944868f2090bd7c3eb4 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 22 Nov 2017 17:24:20 +0100 Subject: [PATCH] fix(content-manager): set correctly multi part content --- src/content/content-manager.cpp | 7 ++----- src/content/content-type.cpp | 3 ++- src/content/content-type.h | 3 ++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/content/content-manager.cpp b/src/content/content-manager.cpp index afdcd6ff3..752a74445 100644 --- a/src/content/content-manager.cpp +++ b/src/content/content-manager.cpp @@ -68,8 +68,6 @@ list ContentManager::multipartToContentList (const Content &content) { } Content ContentManager::contentListToMultipart (const list &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 &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 &contents) { Content content; content.setBody(desc); - content.setContentType(ContentType("application", sub)); + content.setContentType(ContentType::Multipart); belle_sip_free(desc); belle_sip_object_unref(mpbh); diff --git a/src/content/content-type.cpp b/src/content/content-type.cpp index 8c8d69859..7245bf36f 100644 --- a/src/content/content-type.cpp +++ b/src/content/content-type.cpp @@ -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"); // ----------------------------------------------------------------------------- diff --git a/src/content/content-type.h b/src/content/content-type.h index a66955a94..6969ce843 100644 --- a/src/content/content-type.h +++ b/src/content/content-type.h @@ -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);