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

Update MS2+log

Browse source
This commit is contained in:
Julien Wadel 2022-01-24 13:10:20 +01:00
parent c34bde416f
commit 0ebff280af
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -885,6 +885,7 @@ void ChatRoomModel::updateNewMessageNotice(const int& count){
}
void ChatRoomModel::initEntries(){
qInfo() << "Init entries";
// On call : reinitialize all entries. This allow to free up memory
QList<std::shared_ptr<ChatEvent> > entries;
QList<EntrySorterHelper> prepareEntries;
@ -920,6 +921,7 @@ void ChatRoomModel::initEntries(){
}
int ChatRoomModel::loadMoreEntries(){
qInfo() << "Load more entries";
QList<std::shared_ptr<ChatEvent> > entries;
QList<EntrySorterHelper> prepareEntries;
// Get current event count for each type

13
linphone-app/src/components/chat-room/ChatRoomProxyModel.cpp
View file

@ -270,7 +270,7 @@ QString ChatRoomProxyModel::getCachedText() const{
// -----------------------------------------------------------------------------
void ChatRoomProxyModel::reload (ChatRoomModel *chatRoomModel) {
qInfo() << "Reloading";
if (mChatRoomModel) {
ChatRoomModel *ChatRoomModel = mChatRoomModel.get();
QObject::disconnect(ChatRoomModel, &ChatRoomModel::isRemoteComposingChanged, this, &ChatRoomProxyModel::handleIsRemoteComposingChanged);
@ -301,6 +301,7 @@ void ChatRoomProxyModel::resetMessageCount(){
}
void ChatRoomProxyModel::setFilterText(const QString& text){
qInfo() << "setFilterText : " << text;
if( mFilterText != text && mChatRoomModel){
mFilterText = text;
int currentRowCount = rowCount();
@ -319,9 +320,12 @@ ChatRoomModel *ChatRoomProxyModel::getChatRoomModel () const{
}
void ChatRoomProxyModel::setChatRoomModel (ChatRoomModel *chatRoomModel){
reload(chatRoomModel);
emit chatRoomModelChanged();
emit isRemoteComposingChanged();
if( mChatRoomModel.get() != chatRoomModel){
qInfo() << "setChatRoomModel : " << mChatRoomModel.get() << "/" << chatRoomModel;
reload(chatRoomModel);
emit chatRoomModelChanged();
emit isRemoteComposingChanged();
}
}
// -----------------------------------------------------------------------------
@ -339,6 +343,7 @@ void ChatRoomProxyModel::handleIsActiveChanged (QWindow *window) {
if (markAsReadEnabled() && mChatRoomModel && window->isActive() && getParentWindow(this) == window) {
auto timeline = CoreManager::getInstance()->getTimelineListModel()->getTimeline(mChatRoomModel->getChatRoom(), false);
if(timeline && timeline->mSelected){
qInfo() << "Active changed : reset message count and focused";
mChatRoomModel->resetMessageCount();
mChatRoomModel->focused();
}

2
linphone-sdk

@ -1 +1 @@
Subproject commit 4114144fac5b39dab25fa3d1bf819e6466c9f929
Subproject commit a0aa14ebd59aaee88ba56255ebff5a846f2cc13d