mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix persistent call bubble notification

Browse source
This commit is contained in:
Julien Wadel 2021-08-17 10:43:39 +02:00
parent ef3556dbbb
commit 17466eff7f
5 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -220,6 +220,7 @@ ChatRoomModel::ChatRoomModel (std::shared_ptr<linphone::ChatRoom> chatRoom, QObj
QObject::connect(coreManager->getContactsListModel(), &ContactsListModel::contactAdded, this, &ChatRoomModel::fullPeerAddressChanged);
QObject::connect(coreManager->getContactsListModel(), &ContactsListModel::contactRemoved, this, &ChatRoomModel::usernameChanged);
QObject::connect(coreManager->getContactsListModel(), &ContactsListModel::contactRemoved, this, &ChatRoomModel::fullPeerAddressChanged);
//QObject::connect(this, &ChatRoomModel::messageCountReset, coreManager, &CoreManager::eventCountChanged );
if(mChatRoom){
@ -633,8 +634,8 @@ void ChatRoomModel::resetMessageCount () {
}
setUnreadMessagesCount(mChatRoom->getUnreadMessagesCount());
setMissedCallsCount(0);
CoreManager::getInstance()->updateUnreadMessageCount();
emit messageCountReset();
CoreManager::getInstance()->updateUnreadMessageCount();
}
}
//-------------------------------------------------

4
linphone-app/src/components/core/CoreManager.cpp
View file

@ -275,6 +275,10 @@ void CoreManager::createLinphoneCore (const QString &configPath) {
mCore->enableFriendListSubscription(true);
}
void CoreManager::handleChatRoomCreated(const std::shared_ptr<ChatRoomModel> &chatRoomModel){
emit chatRoomModelCreated(chatRoomModel);
}
void CoreManager::migrate () {
shared_ptr<linphone::Config> config = mCore->getConfig();
int rcVersion = config->getInt(SettingsModel::UiSection, RcVersionName, 0);

1
linphone-app/src/components/core/CoreManager.hpp
View file

@ -168,6 +168,7 @@ public slots:
void stopIterate();
void setLastRemoteProvisioningState(const linphone::ConfiguringState& state);
void createLinphoneCore (const QString &configPath);// In order to delay creation
void handleChatRoomCreated(const std::shared_ptr<ChatRoomModel> &chatRoomModel);
signals:
void coreManagerInitialized ();

2
linphone-app/src/components/timeline/TimelineModel.cpp
View file

@ -51,8 +51,10 @@ TimelineModel::TimelineModel (std::shared_ptr<linphone::ChatRoom> chatRoom, QObj
mChatRoomModel = ChatRoomModel::create(chatRoom);
// mChatRoomModel = CoreManager::getInstance()->getTimelineListModel()->getChatRoomModel(chatRoom);
if( mChatRoomModel ){
CoreManager::getInstance()->handleChatRoomCreated(mChatRoomModel);
QObject::connect(mChatRoomModel.get(), &ChatRoomModel::unreadMessagesCountChanged, this, &TimelineModel::updateUnreadCount);
QObject::connect(mChatRoomModel.get(), &ChatRoomModel::missedCallsCountChanged, this, &TimelineModel::updateUnreadCount);
QObject::connect(this, &TimelineModel::selectedChanged, this, &TimelineModel::updateUnreadCount);
QObject::connect(CoreManager::getInstance()->getAccountSettingsModel(), &AccountSettingsModel::defaultProxyChanged, this, &TimelineModel::onDefaultProxyChanged);
}

1
linphone-app/ui/views/App/Main/Conversation.qml
View file

@ -402,7 +402,6 @@ ColumnLayout {
if (!SettingsModel.chatEnabled) {
setEntryTypeFilter(ChatRoomModel.CallEntry)
}
resetMessageCount()
}
chatRoomModel: conversation.chatRoomModel
peerAddress: conversation.peerAddress