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

reset current chat when switching account (fix #LINQT-1971)

Browse source
This commit is contained in:
Gaelle Braud 2025-09-03 11:38:20 +02:00
parent d3d352948b
commit d5841e45ec
7 changed files with 59 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Linphone/core/App.cpp
View file

@ -417,7 +417,10 @@ void App::setSelf(QSharedPointer<App>(me)) {
});
mCoreModelConnection->makeConnectToModel(&CoreModel::defaultAccountChanged, [this] {
int n = mEventCountNotifier->getCurrentEventCount();
mCoreModelConnection->invokeToCore([this, n] { mEventCountNotifier->notifyEventCount(n); });
mCoreModelConnection->invokeToCore([this, n] {
mEventCountNotifier->notifyEventCount(n);
emit defaultAccountChanged();
});
});
//---------------------------------------------------------------------------------------------

1
Linphone/core/App.hpp
View file

@ -182,6 +182,7 @@ signals:
void mainWindowChanged();
void coreStartedChanged(bool coreStarted);
void accountsChanged();
void defaultAccountChanged();
void callsChanged();
void currentDateChanged();
// void executeCommand(QString command);

2
Linphone/core/participant/ParticipantInfoProxy.cpp
View file

@ -44,7 +44,7 @@ ChatGui *ParticipantInfoProxy::getChat() const {
}
void ParticipantInfoProxy::setChat(ChatGui *chat) {
lDebug() << "[ParticipantInfoProxy] set current chat " << this << " => " << chat;
lDebug() << "[ParticipantInfoProxy] set current chat " << chat;
if (mChat != chat) {
mChat = chat;
mParticipants->setChatCore(chat ? chat->mCore : nullptr);

30
Linphone/data/languages/de.ts
View file

@ -530,87 +530,87 @@
</message>
<message>
<location filename="../../core/App.cpp" line="386"/>
<location filename="../../core/App.cpp" line="636"/>
<location filename="../../core/App.cpp" line="639"/>
<source>info_popup_error_title</source>
<extracomment>Error</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../core/App.cpp" line="387"/>
<location filename="../../core/App.cpp" line="638"/>
<location filename="../../core/App.cpp" line="641"/>
<source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../core/App.cpp" line="632"/>
<location filename="../../core/App.cpp" line="635"/>
<source>configuration_error_detail</source>
<extracomment>not reachable</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../core/App.cpp" line="891"/>
<location filename="../../core/App.cpp" line="894"/>
<source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>Ein kostenloses Open-Source SIP Video-Telefon.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="893"/>
<location filename="../../core/App.cpp" line="896"/>
<source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Kommandozeilen-Befehl an die Anwendung schicken</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="897"/>
<location filename="../../core/App.cpp" line="900"/>
<source>command_line_option_show_help</source>
<translation>Zeige Hilfe</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="902"/>
<location filename="../../core/App.cpp" line="905"/>
<source>command_line_option_show_app_version</source>
<translation type="unfinished">Zeige App-Version</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="910"/>
<location filename="../../core/App.cpp" line="913"/>
<source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Abzurufende Linphone-Konfigurationsdatei angeben. Sie wird mit der aktuellen Konfiguration zusammengeführt.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="912"/>
<location filename="../../core/App.cpp" line="915"/>
<source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, Pfad oder Datei</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="917"/>
<location filename="../../core/App.cpp" line="920"/>
<source>command_line_option_minimized</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../core/App.cpp" line="920"/>
<location filename="../../core/App.cpp" line="923"/>
<source>command_line_option_log_to_stdout</source>
<translation>Debug-Informationen auf der Standardausgabe ausgeben</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="923"/>
<location filename="../../core/App.cpp" line="926"/>
<source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Nur Anwendungs-Logs ausgeben</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1293"/>
<location filename="../../core/App.cpp" line="1296"/>
<source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Ausblenden</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1293"/>
<location filename="../../core/App.cpp" line="1296"/>
<source>show_action</source>
<translation>Zeigen</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1308"/>
<location filename="../../core/App.cpp" line="1311"/>
<source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment>
<translation>Beenden</translation>

30
Linphone/data/languages/en.ts
View file

@ -530,87 +530,87 @@
</message>
<message>
<location filename="../../core/App.cpp" line="386"/>
<location filename="../../core/App.cpp" line="636"/>
<location filename="../../core/App.cpp" line="639"/>
<source>info_popup_error_title</source>
<extracomment>Error</extracomment>
<translation>Error</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="387"/>
<location filename="../../core/App.cpp" line="638"/>
<location filename="../../core/App.cpp" line="641"/>
<source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment>
<translation>Remote provisioning failed : %1</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="632"/>
<location filename="../../core/App.cpp" line="635"/>
<source>configuration_error_detail</source>
<extracomment>not reachable</extracomment>
<translation>not reachable</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="891"/>
<location filename="../../core/App.cpp" line="894"/>
<source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>A free and open source SIP video-phone.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="893"/>
<location filename="../../core/App.cpp" line="896"/>
<source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Send an order to the application towards a command line</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="897"/>
<location filename="../../core/App.cpp" line="900"/>
<source>command_line_option_show_help</source>
<translation>Show this help</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="902"/>
<location filename="../../core/App.cpp" line="905"/>
<source>command_line_option_show_app_version</source>
<translation>Show app version</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="910"/>
<location filename="../../core/App.cpp" line="913"/>
<source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="912"/>
<location filename="../../core/App.cpp" line="915"/>
<source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, path or file</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="917"/>
<location filename="../../core/App.cpp" line="920"/>
<source>command_line_option_minimized</source>
<translation>Minimize</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="920"/>
<location filename="../../core/App.cpp" line="923"/>
<source>command_line_option_log_to_stdout</source>
<translation>Log to stdout some debug information while running</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="923"/>
<location filename="../../core/App.cpp" line="926"/>
<source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Print only logs from the application</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1293"/>
<location filename="../../core/App.cpp" line="1296"/>
<source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Hide</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1293"/>
<location filename="../../core/App.cpp" line="1296"/>
<source>show_action</source>
<translation>Show</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1308"/>
<location filename="../../core/App.cpp" line="1311"/>
<source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment>
<translation>Quit</translation>

30
Linphone/data/languages/fr_FR.ts
View file

@ -530,87 +530,87 @@
</message>
<message>
<location filename="../../core/App.cpp" line="386"/>
<location filename="../../core/App.cpp" line="636"/>
<location filename="../../core/App.cpp" line="639"/>
<source>info_popup_error_title</source>
<extracomment>Error</extracomment>
<translation>Erreur</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="387"/>
<location filename="../../core/App.cpp" line="638"/>
<location filename="../../core/App.cpp" line="641"/>
<source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment>
<translation>La configuration distante a échoué : %1</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="632"/>
<location filename="../../core/App.cpp" line="635"/>
<source>configuration_error_detail</source>
<extracomment>not reachable</extracomment>
<translation>indisponible</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="891"/>
<location filename="../../core/App.cpp" line="894"/>
<source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>A free and open source SIP video-phone.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="893"/>
<location filename="../../core/App.cpp" line="896"/>
<source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Send an order to the application towards a command line</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="897"/>
<location filename="../../core/App.cpp" line="900"/>
<source>command_line_option_show_help</source>
<translation>Show this help</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="902"/>
<location filename="../../core/App.cpp" line="905"/>
<source>command_line_option_show_app_version</source>
<translation>Afficher la version de l&apos;application</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="910"/>
<location filename="../../core/App.cpp" line="913"/>
<source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="912"/>
<location filename="../../core/App.cpp" line="915"/>
<source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, path or file</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="917"/>
<location filename="../../core/App.cpp" line="920"/>
<source>command_line_option_minimized</source>
<translation>Minimiser</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="920"/>
<location filename="../../core/App.cpp" line="923"/>
<source>command_line_option_log_to_stdout</source>
<translation>Log to stdout some debug information while running</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="923"/>
<location filename="../../core/App.cpp" line="926"/>
<source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Print only logs from the application</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1293"/>
<location filename="../../core/App.cpp" line="1296"/>
<source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Cacher</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1293"/>
<location filename="../../core/App.cpp" line="1296"/>
<source>show_action</source>
<translation>Afficher</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1308"/>
<location filename="../../core/App.cpp" line="1311"/>
<source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment>
<translation>Quitter</translation>

8
Linphone/view/Page/Main/Chat/ChatPage.qml
View file

@ -346,6 +346,14 @@ AbstractMainPage {
onChatChanged: {
if (mainItem.selectedChatGui !== chat) mainItem.selectedChatGui = chat
}
// Reset current chat when switching account, otherwise the binding makes
// the last chat from last account the current chat for the new default account
Connections {
target: AppCpp
function onDefaultAccountChanged() {
selectedChatView.chat = null
}
}
// Binding is destroyed when forward message is done so
// we need this connection in addition
Connections {