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

Try not to use getContentType and getText methods

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-06 17:06:07 +02:00
parent b1f48f5769
commit 4fc9080881
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/chat/chat-message.cpp
View file

@ -996,7 +996,7 @@ LinphoneReason ChatMessagePrivate::receive() {
// Start of message modification
// ---------------------------------------
if (getContentType() == ContentType::Cpim) {
if (internalContent.getContentType() == ContentType::Cpim) {
CpimChatMessageModifier ccmm;
ccmm.decode(q->getSharedFromThis(), &errorCode);
}
@ -1174,6 +1174,10 @@ void ChatMessagePrivate::send() {
// End of message modification
// ---------------------------------------
if (internalContent.isEmpty()) {
internalContent = contents.front();
}
if (!externalBodyUrl.empty()) {
char *content_type = ms_strdup_printf("message/external-body; access-type=URL; URL=\"%s\"", externalBodyUrl.c_str());
auto msgOp = dynamic_cast<SalMessageOpInterface *>(op);
@ -1181,10 +1185,10 @@ void ChatMessagePrivate::send() {
ms_free(content_type);
} else {
auto msgOp = dynamic_cast<SalMessageOpInterface *>(op);
if (getContentType().isValid()) {
msgOp->send_message(from.asString().c_str(), chatRoom->getPeerAddress().asString().c_str(), getContentType().asString().c_str(), getText().c_str(), chatRoom->getPeerAddress().asStringUriOnly().c_str());
if (internalContent.getContentType().isValid()) {
msgOp->send_message(from.asString().c_str(), chatRoom->getPeerAddress().asString().c_str(), internalContent.getContentType().asString().c_str(), internalContent.getBodyAsString().c_str(), chatRoom->getPeerAddress().asStringUriOnly().c_str());
} else {
msgOp->send_message(from.asString().c_str(), chatRoom->getPeerAddress().asString().c_str(), getText().c_str());
msgOp->send_message(from.asString().c_str(), chatRoom->getPeerAddress().asString().c_str(), internalContent.getBodyAsString().c_str());
}
}