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

better generation of the notify body

Browse source
This commit is contained in:
Benjamin Reis 2018-03-16 20:38:26 +01:00
parent cb720429fa
commit 477e5f698c
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -184,7 +184,8 @@ string LocalConferenceEventHandlerPrivate::createNotifyMultipart (int notifyId)
}
if (contents.empty())
return "";
return Utils::getEmptyConstRefObject<string>();
return ContentManager::contentListToMultipart(contents).getBodyAsString();
}

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

@ -35,7 +35,7 @@ using namespace std;
LINPHONE_BEGIN_NAMESPACE
namespace {
constexpr const char MultipartBoundary[] = "---------------------------14737809831412343453453";
constexpr const char MultipartBoundaryListEventHandler[] = "---------------------------14737809831412343453453";
}
// -----------------------------------------------------------------------------
@ -82,7 +82,7 @@ void LocalConferenceListEventHandler::subscribeReceived (const string &xmlBody)
}
contents.push_front(rlmiContent);
Content multipart = ContentManager::contentListToMultipart(contents);
Content multipart = ContentManager::contentListToMultipart(contents, MultipartBoundaryListEventHandler);
(void) multipart;
}

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

@ -29,10 +29,6 @@ using namespace std;
LINPHONE_BEGIN_NAMESPACE
namespace {
constexpr const char MultipartBoundary[] = "---------------------------14737809831466499882746641449";
}
// -----------------------------------------------------------------------------
list<Content> ContentManager::multipartToContentList (const Content &content) {
@ -69,9 +65,9 @@ list<Content> ContentManager::multipartToContentList (const Content &content) {
return contents;
}
Content ContentManager::contentListToMultipart (const list<Content> &contents) {
Content ContentManager::contentListToMultipart (const list<Content> &contents, const string &boundary) {
belle_sip_multipart_body_handler_t *mpbh = belle_sip_multipart_body_handler_new(
nullptr, nullptr, nullptr, MultipartBoundary
nullptr, nullptr, nullptr, boundary.c_str()
);
belle_sip_object_ref(mpbh);
@ -110,7 +106,7 @@ Content ContentManager::contentListToMultipart (const list<Content> &contents) {
belle_sip_object_unref(mpbh);
ContentType contentType = ContentType::Multipart;
contentType.setParameter("boundary=" + string(MultipartBoundary));
contentType.setParameter("boundary=" + boundary);
content.setContentType(contentType);
return content;

5
src/content/content-manager.h
View file

@ -30,9 +30,12 @@ LINPHONE_BEGIN_NAMESPACE
class Content;
namespace {
constexpr const char MultipartBoundary[] = "---------------------------14737809831466499882746641449";
}
namespace ContentManager {
std::list<Content> multipartToContentList (const Content &content);
Content contentListToMultipart (const std::list<Content> &contents);
Content contentListToMultipart (const std::list<Content> &contents, const std::string &boundary = MultipartBoundary);
}
LINPHONE_END_NAMESPACE