mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-29 01:39:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix multipart on basic chat rooms

Browse source
This commit is contained in:
Julien Wadel 2022-03-11 14:13:15 +01:00
parent f29072dfe7
commit 1614495cbe
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
linphone-app/src/components/chat-room/ChatRoomModel.cpp
View file

@ -532,6 +532,10 @@ bool ChatRoomModel::isEntriesLoading() const{
return mEntriesLoading;
}
bool ChatRoomModel::isBasic() const{
return mChatRoom && mChatRoom->hasCapability((int)linphone::ChatRoomCapabilities::Basic);
}
std::shared_ptr<linphone::ChatRoom> ChatRoomModel::getChatRoom(){
return mChatRoom;
}
@ -699,29 +703,40 @@ void ChatRoomModel::updateParticipants(const QVariantList& participants){
// -----------------------------------------------------------------------------
void ChatRoomModel::sendMessage (const QString &message) {
shared_ptr<linphone::ChatMessage> _message;
std::list<shared_ptr<linphone::ChatMessage> > _messages;
bool isBasicChatRoom = isBasic();
if(mReplyModel && mReplyModel->getChatMessage()) {
_message = mChatRoom->createReplyMessage(mReplyModel->getChatMessage());
_messages.push_back(mChatRoom->createReplyMessage(mReplyModel->getChatMessage()));
}else
_message= mChatRoom->createEmptyMessage();
_messages.push_back(mChatRoom->createEmptyMessage());
auto recorder = CoreManager::getInstance()->getRecorderManager();
if(recorder->haveVocalRecorder()) {
recorder->getVocalRecorder()->stop();
auto content = recorder->getVocalRecorder()->getRecorder()->createContent();
if(content) {
_message->addContent(content);
_messages.back()->addContent(content);
}
}
auto fileContents = CoreManager::getInstance()->getChatModel()->getContentListModel()->getContents();
for(auto content : fileContents){
_message->addFileContent(content->getContent());
if(isBasicChatRoom && _messages.back()->getContents().size() > 0) // Basic chat rooms don't support multipart
_messages.push_back(mChatRoom->createEmptyMessage());
_messages.back()->addFileContent(content->getContent());
}
if(!message.isEmpty()) {
_message->addUtf8TextContent(message.toUtf8().toStdString());
if(isBasicChatRoom && _messages.back()->getContents().size() > 0) // Basic chat rooms don't support multipart
_messages.push_back(mChatRoom->createEmptyMessage());
_messages.back()->addUtf8TextContent(message.toUtf8().toStdString());
}
if(_message->getContents().size() > 0){// Have something to send
_message->send();
emit messageSent(_message);
bool sent = false;
for(auto itMessage = _messages.begin() ; itMessage != _messages.end() ; ++itMessage) {
if((*itMessage)->getContents().size() > 0){// Have something to send
(*itMessage)->send();
emit messageSent((*itMessage));
sent = true;
}
}
if(sent){
setReply(nullptr);
if(recorder->haveVocalRecorder())
recorder->clearVocalRecorder();

1
linphone-app/src/components/chat-room/ChatRoomModel.hpp
View file

@ -196,6 +196,7 @@ public:
bool canHandleParticipants() const;
bool getIsRemoteComposing () const;
bool isEntriesLoading() const;
bool isBasic() const;
ParticipantListModel* getParticipants() const;
std::shared_ptr<linphone::ChatRoom> getChatRoom();
QList<QString> getComposers();