witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Send message with external body url if exists

Browse source
This commit is contained in:
Sylvain Berfini 2018-03-15 14:09:42 +01:00
parent 1207501da2
commit 166b0a5d62
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/chat/chat-message/chat-message-p.h
View file

@ -163,6 +163,7 @@ private:
time_t time = ::ms_time(0); // TODO: Change me in all files.
std::string imdnId;
std::string rttMessage;
std::string externalBodyUrl;
bool isSecured = false;
mutable bool isReadOnly = false;
Content internalContent;

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

@ -256,6 +256,9 @@ void ChatMessagePrivate::setAppdata (const string &data) {
}
const string &ChatMessagePrivate::getExternalBodyUrl () const {
if (!externalBodyUrl.empty()) {
return externalBodyUrl;
}
if (hasFileTransferContent()) {
FileTransferContent *content = (FileTransferContent*) getFileTransferContent();
return content->getFileUrl();
@ -264,7 +267,7 @@ const string &ChatMessagePrivate::getExternalBodyUrl () const {
}
void ChatMessagePrivate::setExternalBodyUrl (const string &url) {
//TODO
externalBodyUrl = url;
}
const ContentType &ChatMessagePrivate::getContentType () {
@ -719,14 +722,18 @@ void ChatMessagePrivate::send () {
if (internalContent.isEmpty()) {
if (contents.size() > 0) {
internalContent = *(contents.front());
} else {
} else if (!externalBodyUrl.empty()) { // When using external body url, there is no content
lError() << "Trying to send a message without any content !";
return;
}
}
auto msgOp = dynamic_cast<SalMessageOpInterface *>(op);
if (internalContent.getContentType().isValid()) {
if (!externalBodyUrl.empty()) {
char *content_type = ms_strdup_printf("message/external-body; access-type=URL; URL=\"%s\"", externalBodyUrl);
msgOp->send_message(content_type, NULL);
ms_free(content_type);
} else if (internalContent.getContentType().isValid()) {
msgOp->send_message(internalContent.getContentType().asString().c_str(), internalContent.getBodyAsUtf8String().c_str());
} else {
msgOp->send_message(ContentType::PlainText.asString().c_str(), internalContent.getBodyAsUtf8String().c_str());