From b4b0e05c97ad908779aca252e2e2195ce62adc20 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 11 Oct 2021 14:41:35 +0200 Subject: [PATCH] Fix UTF8 on Subject, events and chat rooms (secure/group chat) --- linphone-app/src/components/chat-events/ChatNoticeModel.cpp | 2 +- linphone-app/src/components/chat-room/ChatRoomModel.cpp | 3 +-- linphone-sdk | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/linphone-app/src/components/chat-events/ChatNoticeModel.cpp b/linphone-app/src/components/chat-events/ChatNoticeModel.cpp index d1006678f..428300b1d 100644 --- a/linphone-app/src/components/chat-events/ChatNoticeModel.cpp +++ b/linphone-app/src/components/chat-events/ChatNoticeModel.cpp @@ -113,7 +113,7 @@ bool ChatNoticeModel::update(){ } case linphone::EventLog::Type::ConferenceSubjectChanged : { - setName(Utils::coreStringToAppString(mEventLog->getSubject())); + setName(QString::fromStdString(mEventLog->getSubject())); setStatus(NoticeType::NoticeMessage); break; } diff --git a/linphone-app/src/components/chat-room/ChatRoomModel.cpp b/linphone-app/src/components/chat-room/ChatRoomModel.cpp index 1e4ca2de5..8bdf12575 100644 --- a/linphone-app/src/components/chat-room/ChatRoomModel.cpp +++ b/linphone-app/src/components/chat-room/ChatRoomModel.cpp @@ -613,8 +613,7 @@ void ChatRoomModel::updateParticipants(const QVariantList& participants){ // ----------------------------------------------------------------------------- void ChatRoomModel::sendMessage (const QString &message) { - shared_ptr _message = mChatRoom->createMessageFromUtf8(""); - _message->getContents().begin()->get()->setUtf8Text(message.toUtf8().toStdString()); + shared_ptr _message = mChatRoom->createMessageFromUtf8(message.toUtf8().toStdString()); _message->send(); emit messageSent(_message); diff --git a/linphone-sdk b/linphone-sdk index 2a087c0f7..c0e02ff5d 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 2a087c0f73e2658a5efa7357725e1d009a5c51a7 +Subproject commit c0e02ff5d29323ed4569d0e1cf01b484400d0737