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

Merge branch 'fix/6.1' into 'release/6.1'

Browse source 
fix search in chat history

See merge request BC/public/linphone-desktop!1649
This commit is contained in:
Gaëlle Braud 2026-01-19 11:52:40 +00:00
commit 12874fdc14
4 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Linphone/core/chat/message/EventLogList.cpp
View file

@ -223,15 +223,20 @@ void EventLogList::findChatMessageWithFilter(QString filter, int startIndex, boo
lInfo() << log().arg("searching event starting from index") << startIndex << "| event :"
<< (startEvent && startEvent->getChatMessageCore() ? startEvent->getChatMessageCore()->getText()
: "null")
<< "| filter :" << filter;
<< "| filter :" << filter << "forward =" << forward;
auto startEventModel = startEvent ? startEvent->getModel() : nullptr;
mCoreModelConnection->invokeToModel([this, chatModel, startEventModel, filter, forward, isFirstResearch] {
auto linStartEvent = startEventModel ? startEventModel->getEventLog() : nullptr;
auto eventLog = chatModel->searchMessageByText(filter, linStartEvent, forward);
if (!eventLog) {
if (!eventLog && isFirstResearch) {
// event not found, search backward
lInfo() << log().arg("not found, search backward");
eventLog = chatModel->searchMessageByText(filter, linStartEvent, !forward);
}
if (!eventLog && isFirstResearch) {
// event not found, search in the entire history
lInfo() << log().arg("not found, search in entire history");
auto eventLog = chatModel->searchMessageByText(filter, nullptr, forward);
eventLog = chatModel->searchMessageByText(filter, nullptr, forward);
}
int index = -1;
if (eventLog) {

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

@ -6050,49 +6050,49 @@ Um sie in einem kommerziellen Projekt zu aktivieren, kontaktieren Sie uns bitte.
<context>
<name>ToolModel</name>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="330"/>
<location filename="../../model/tool/ToolModel.cpp" line="329"/>
<source>call_error_uninterpretable_sip_address</source>
<extracomment>&quot;The calling address is not an interpretable SIP address : %1</extracomment>
<translation>Die Anrufadresse ist keine interpretierbare SIP-Adresse: %1</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="405"/>
<location filename="../../model/tool/ToolModel.cpp" line="404"/>
<source>group_call_error_no_account</source>
<translation>Kein Standardkonto gefunden, Gruppengespräch kann nicht erstellt werden</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="435"/>
<location filename="../../model/tool/ToolModel.cpp" line="434"/>
<source>group_call_error_participants_invite</source>
<translation>Teilnehmer konnten nicht zum Gruppengespräch eingeladen werden</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="439"/>
<location filename="../../model/tool/ToolModel.cpp" line="438"/>
<source>group_call_error_creation</source>
<translation>Gruppengespräch konnte nicht erstellt werden</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="539"/>
<location filename="../../model/tool/ToolModel.cpp" line="538"/>
<source>voice_recording_duration</source>
<extracomment>&quot;Voice recording (%1)&quot; : %1 is the duration formated in mm:ss</extracomment>
<translation>Sprachnachricht (%1)</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="547"/>
<location filename="../../model/tool/ToolModel.cpp" line="546"/>
<source>conference_invitation</source>
<translation>Meeting-Einladung</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="549"/>
<location filename="../../model/tool/ToolModel.cpp" line="548"/>
<source>conference_invitation_updated</source>
<translation>Meeting-Änderung</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="551"/>
<location filename="../../model/tool/ToolModel.cpp" line="550"/>
<source>conference_invitation_cancelled</source>
<translation>Meeting-Absage</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="613"/>
<location filename="../../model/tool/ToolModel.cpp" line="612"/>
<source>unknown_audio_device_name</source>
<translation>Unbekannter Gerätename</translation>
</message>

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

@ -5915,49 +5915,49 @@ To enable them in a commercial project, please contact us.</translation>
<context>
<name>ToolModel</name>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="330"/>
<location filename="../../model/tool/ToolModel.cpp" line="329"/>
<source>call_error_uninterpretable_sip_address</source>
<extracomment>&quot;The calling address is not an interpretable SIP address : %1</extracomment>
<translation>The calling address is not an interpretable SIP address : %1</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="405"/>
<location filename="../../model/tool/ToolModel.cpp" line="404"/>
<source>group_call_error_no_account</source>
<translation>No default account found, can&apos;t create group call</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="435"/>
<location filename="../../model/tool/ToolModel.cpp" line="434"/>
<source>group_call_error_participants_invite</source>
<translation>Couldn&apos;t invite participants to group call</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="439"/>
<location filename="../../model/tool/ToolModel.cpp" line="438"/>
<source>group_call_error_creation</source>
<translation>Group call couldn&apos;t be created</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="539"/>
<location filename="../../model/tool/ToolModel.cpp" line="538"/>
<source>voice_recording_duration</source>
<extracomment>&quot;Voice recording (%1)&quot; : %1 is the duration formated in mm:ss</extracomment>
<translation>Voice recording (%1)</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="613"/>
<location filename="../../model/tool/ToolModel.cpp" line="612"/>
<source>unknown_audio_device_name</source>
<translation>Unknown device name</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="547"/>
<location filename="../../model/tool/ToolModel.cpp" line="546"/>
<source>conference_invitation</source>
<translation>Meeting invitation</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="551"/>
<location filename="../../model/tool/ToolModel.cpp" line="550"/>
<source>conference_invitation_cancelled</source>
<translation>Meeting cancellation</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="549"/>
<location filename="../../model/tool/ToolModel.cpp" line="548"/>
<source>conference_invitation_updated</source>
<translation>Meeting modification</translation>
</message>

18
Linphone/data/languages/fr.ts
View file

@ -5886,49 +5886,49 @@ Pour les activer dans un projet commercial, merci de nous contacter.</translatio
<context>
<name>ToolModel</name>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="330"/>
<location filename="../../model/tool/ToolModel.cpp" line="329"/>
<source>call_error_uninterpretable_sip_address</source>
<extracomment>&quot;The calling address is not an interpretable SIP address : %1</extracomment>
<translation>L&apos;adresse n&apos;est pas interprétable comme une adresse SIP</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="405"/>
<location filename="../../model/tool/ToolModel.cpp" line="404"/>
<source>group_call_error_no_account</source>
<translation>Impossible de créer l&apos;appel de groupe, le compte par défaut n&apos;est pas défini</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="435"/>
<location filename="../../model/tool/ToolModel.cpp" line="434"/>
<source>group_call_error_participants_invite</source>
<translation>Impossible d&apos;inviter les participants à l&apos;appel de groupe</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="439"/>
<location filename="../../model/tool/ToolModel.cpp" line="438"/>
<source>group_call_error_creation</source>
<translation>L&apos;appel de groupe n&apos;a pas pu être créé</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="539"/>
<location filename="../../model/tool/ToolModel.cpp" line="538"/>
<source>voice_recording_duration</source>
<extracomment>&quot;Voice recording (%1)&quot; : %1 is the duration formated in mm:ss</extracomment>
<translation>Message vocal (%1)</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="613"/>
<location filename="../../model/tool/ToolModel.cpp" line="612"/>
<source>unknown_audio_device_name</source>
<translation>Appareil inconnu</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="547"/>
<location filename="../../model/tool/ToolModel.cpp" line="546"/>
<source>conference_invitation</source>
<translation>Invitation à une réunion</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="551"/>
<location filename="../../model/tool/ToolModel.cpp" line="550"/>
<source>conference_invitation_cancelled</source>
<translation>Annulation d&apos;une réunion</translation>
</message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="549"/>
<location filename="../../model/tool/ToolModel.cpp" line="548"/>
<source>conference_invitation_updated</source>
<translation>Modification d&apos;une réunion</translation>
</message>