mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-28 16:49:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deprecated getText() on ChatMessage + attempt to fix getText()

Browse source
This commit is contained in:
Sylvain Berfini 2017-11-07 10:23:16 +01:00
parent f18fcbdf2f
commit bcfa66e447
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/linphone/api/c-chat-message.h
View file

@ -135,6 +135,7 @@ LINPHONE_PUBLIC void linphone_chat_message_set_content_type(LinphoneChatMessage
/**
* Get text part of this message
* @return text or NULL if no text.
* @deprecated use getTextContent() instead
*/
LINPHONE_PUBLIC const char* linphone_chat_message_get_text(LinphoneChatMessage* msg);

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

@ -81,7 +81,7 @@ public:
std::string getSalCustomHeaderValue(const std::string& name);
// -----------------------------------------------------------------------------
// Methods only used for C wrapper
// Methods only used for C wrapper, to be removed some day...
// -----------------------------------------------------------------------------
const ContentType &getContentType();

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

@ -187,7 +187,9 @@ const string &ChatMessagePrivate::getText () {
cText = internalContent.getBodyAsString();
}
} else {
if (!internalContent.isEmpty()) {
if (hasTextContent()) {
cText = getTextContent.getBodyAsString();
} else if (!internalContent.isEmpty()) {
cText = internalContent.getBodyAsString();
} else {
if (contents.size() > 0) {