data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix double notification for messages

Browse source
This commit is contained in:
Gaelle Braud 2025-09-03 12:05:23 +02:00
parent d5841e45ec
commit cbc9c5e2b9
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Linphone/core/chat/ChatList.cpp
View file

@ -121,6 +121,7 @@ void ChatList::setSelf(QSharedPointer<ChatList> me) {
const std::shared_ptr<linphone::ChatRoom> &room, const std::shared_ptr<linphone::ChatRoom> &room,
const std::shared_ptr<linphone::ChatMessage> &message) { const std::shared_ptr<linphone::ChatMessage> &message) {
mustBeInLinphoneThread(log().arg(Q_FUNC_INFO)); mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
if (!message) return;
auto receiverAddress = message->getToAddress(); auto receiverAddress = message->getToAddress();
if (!receiverAddress) { if (!receiverAddress) {
qWarning() << log().arg("Receiver account has no address, return"); qWarning() << log().arg("Receiver account has no address, return");

19
Linphone/model/core/CoreModel.cpp
View file

@ -526,18 +526,29 @@ void CoreModel::onLogCollectionUploadProgressIndication(const std::shared_ptr<li
void CoreModel::onMessageReceived(const std::shared_ptr<linphone::Core> &core, void CoreModel::onMessageReceived(const std::shared_ptr<linphone::Core> &core,
const std::shared_ptr<linphone::ChatRoom> &room, const std::shared_ptr<linphone::ChatRoom> &room,
const std::shared_ptr<linphone::ChatMessage> &message) { const std::shared_ptr<linphone::ChatMessage> &message) {
if (message->isOutgoing()) return;
emit unreadNotificationsChanged(); emit unreadNotificationsChanged();
std::list<std::shared_ptr<linphone::ChatMessage>> messages; std::list<std::shared_ptr<linphone::ChatMessage>> messages;
messages.push_back(message); messages.push_back(message);
if (App::getInstance()->getNotifier()) App::getInstance()->getNotifier()->notifyReceivedMessages(room, messages); if (App::getInstance()->getNotifier()) {
App::getInstance()->getNotifier()->notifyReceivedMessages(room, messages);
}
emit messageReceived(core, room, message); emit messageReceived(core, room, message);
} }
void CoreModel::onMessagesReceived(const std::shared_ptr<linphone::Core> &core, void CoreModel::onMessagesReceived(const std::shared_ptr<linphone::Core> &core,
const std::shared_ptr<linphone::ChatRoom> &room, const std::shared_ptr<linphone::ChatRoom> &room,
const std::list<std::shared_ptr<linphone::ChatMessage>> &messages) { const std::list<std::shared_ptr<linphone::ChatMessage>> &messages) {
emit unreadNotificationsChanged(); std::list<std::shared_ptr<linphone::ChatMessage>> finalMessages;
if (App::getInstance()->getNotifier()) App::getInstance()->getNotifier()->notifyReceivedMessages(room, messages); for (auto &message : messages) {
emit messagesReceived(core, room, messages); if (message->isOutgoing()) continue;
finalMessages.push_back(message);
}
if (finalMessages.size() > 0) {
emit unreadNotificationsChanged();
emit messagesReceived(core, room, finalMessages);
}
if (App::getInstance()->getNotifier())
App::getInstance()->getNotifier()->notifyReceivedMessages(room, finalMessages);
} }
void CoreModel::onNewMessageReaction(const std::shared_ptr<linphone::Core> &core, void CoreModel::onNewMessageReaction(const std::shared_ptr<linphone::Core> &core,