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

Fixed legacy getText method on ChatMessage

Browse source
This commit is contained in:
Sylvain Berfini 2018-02-01 10:31:53 +01:00
parent a705f8dda6
commit 3b64a06c3b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -259,9 +259,7 @@ const string &ChatMessagePrivate::getText () {
cText = internalContent.getBodyAsString();
}
} else {
if (hasTextContent()) {
cText = getTextContent()->getBodyAsString();
} else if (!internalContent.isEmpty()) {
if (!internalContent.isEmpty()) {
cText = internalContent.getBodyAsString();
} else {
if (contents.size() > 0) {
@ -482,6 +480,12 @@ LinphoneReason ChatMessagePrivate::receive () {
// End of message modification
// ---------------------------------------
// Remove internal content as it is not needed anymore and will confuse some old methods like getText()
internalContent.setBody("");
internalContent.setContentType(ContentType(""));
// Also remove current step so we go through all modifiers if message is re-sent
currentRecvStep = ChatMessagePrivate::Step::None;
setState(ChatMessage::State::Delivered, false);
if (errorCode <= 0) {