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

fix #LINQT-1910 wrong proxy index when chat list filtered

Browse source
This commit is contained in:
Gaelle Braud 2025-08-26 12:33:27 +02:00
parent 4203a9c9c0
commit f516505287
5 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ void ChatList::setSelf(QSharedPointer<ChatList> me) {
mModelConnection = SafeConnection<ChatList, CoreModel>::create(me, CoreModel::getInstance()); mModelConnection = SafeConnection<ChatList, CoreModel>::create(me, CoreModel::getInstance());
mModelConnection->makeConnectToCore(&ChatList::lUpdate, [this]() { mModelConnection->makeConnectToCore(&ChatList::lUpdate, [this]() {
clearData(); clearData();
emit listAboutToBeReset(); beginResetModel();
mModelConnection->invokeToModel([this]() { mModelConnection->invokeToModel([this]() {
mustBeInLinphoneThread(getClassName()); mustBeInLinphoneThread(getClassName());
// Avoid copy to lambdas // Avoid copy to lambdas
@ -107,10 +107,8 @@ void ChatList::setSelf(QSharedPointer<ChatList> me) {
connectItem(chat); connectItem(chat);
} }
mustBeInMainThread(getClassName()); mustBeInMainThread(getClassName());
clearData(); add(*chats);
for (auto chat : *chats) { endResetModel();
add(chat);
}
delete chats; delete chats;
}); });
}); });

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

@ -51,7 +51,6 @@ signals:
void chatRemoved(ChatGui *chat); void chatRemoved(ChatGui *chat);
void chatAdded(); void chatAdded();
void chatUpdated(); void chatUpdated();
void listAboutToBeReset();
private: private:
QString mFilter; QString mFilter;

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

@ -44,7 +44,6 @@ void ChatProxy::setSourceModel(QAbstractItemModel *model) {
connect(this, &ChatProxy::filterTextChanged, newChatList, connect(this, &ChatProxy::filterTextChanged, newChatList,
[this, newChatList] { emit newChatList->filterChanged(getFilterText()); }); [this, newChatList] { emit newChatList->filterChanged(getFilterText()); });
connect(newChatList, &ChatList::chatRemoved, this, &ChatProxy::chatRemoved); connect(newChatList, &ChatList::chatRemoved, this, &ChatProxy::chatRemoved);
connect(newChatList, &ChatList::listAboutToBeReset, this, &ChatProxy::listAboutToBeReset);
connect(newChatList, &ChatList::chatAdded, this, [this] { invalidate(); }); connect(newChatList, &ChatList::chatAdded, this, [this] { invalidate(); });
connect(newChatList, &ChatList::dataChanged, this, [this] { invalidate(); }); connect(newChatList, &ChatList::dataChanged, this, [this] { invalidate(); });
} }

1
Linphone/core/chat/ChatProxy.hpp
View file

@ -44,7 +44,6 @@ public:
signals: signals:
void chatRemoved(ChatGui *chat); void chatRemoved(ChatGui *chat);
void listAboutToBeReset();
protected: protected:
QSharedPointer<ChatList> mList; QSharedPointer<ChatList> mList;

8
Linphone/view/Control/Display/Chat/ChatListView.qml
View file

@ -17,9 +17,8 @@ ListView {
property string searchText: searchBar?.text property string searchText: searchBar?.text
property real busyIndicatorSize: Math.round(60 * DefaultStyle.dp) property real busyIndicatorSize: Math.round(60 * DefaultStyle.dp)
property ChatGui currentChatGui property ChatGui currentChatGui: model.getAt(currentIndex) || null
onCurrentIndexChanged: currentChatGui = model.getAt(currentIndex) || null onChatClicked: (chat) => {selectChat(chat)}
onChatClicked: (chat) => {currentChatGui = chat}
signal resultsReceived() signal resultsReceived()
signal markAllAsRead() signal markAllAsRead()
@ -44,7 +43,7 @@ ListView {
onModelReset: { onModelReset: {
mainItem.resultsReceived() mainItem.resultsReceived()
} }
onListAboutToBeReset: { onModelAboutToBeReset: {
loading = true loading = true
} }
onChatRemoved: { onChatRemoved: {
@ -460,7 +459,6 @@ ListView {
chatroomPopup.open() chatroomPopup.open()
} else { } else {
mainItem.chatClicked(modelData) mainItem.chatClicked(modelData)
mainItem.currentIndex = model.index
} }
} }
} }