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

Do not add voice recordings to shared medias (try to fix #LINQT-2308)

Browse source
This commit is contained in:
Gaelle Braud 2026-01-14 10:02:24 +01:00
parent e3a1493ceb
commit 4e8ded737c
8 changed files with 51 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Linphone/core/chat/files/ChatMessageFileList.cpp
View file

@ -77,10 +77,12 @@ void ChatMessageFileList::setSelf(QSharedPointer<ChatMessageFileList> me) {
docs = chatModel->getSharedDocuments();
}
for (auto it : medias) {
if (it->isVoiceRecording()) continue;
auto model = ChatMessageContentCore::create(it, nullptr);
contents->push_back(model);
}
for (auto it : docs) {
if (it->isVoiceRecording()) continue;
auto model = ChatMessageContentCore::create(it, nullptr);
contents->push_back(model);
}

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

@ -2361,37 +2361,37 @@ Error</extracomment>
<translation type="vanished">Fehler</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="80"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="83"/>
<source>download_error_object_doesnt_exist</source>
<extracomment>Internal error : message object does not exist anymore !</extracomment>
<extracomment>Internal error : message object associated to this content does not exist anymore !</extracomment>
<translation>Interner Fehler: Nachrichtenobjekt existiert nicht mehr!</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="95"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="98"/>
<source>download_file_server_error</source>
<extracomment>Error while trying to download content : %1</extracomment>
<translation>Fehler beim Versuch, Inhalte herunterzuladen: %1</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="105"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="108"/>
<source>download_file_error_no_safe_file_path</source>
<extracomment>Unable to create safe file path for: %1</extracomment>
<translation>Speicherpfad konnte nicht erstellen für: %1</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="114"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="117"/>
<source>download_file_error_file_transfer_unavailable</source>
<extracomment>This file was already downloaded and is no more on the server. Your peer have to resend it if you want to get it</extracomment>
<translation>Diese Datei wurde bereits heruntergeladen und ist nicht mehr auf dem Server verfügbar. Ihr Kontakt muss die Datei erneut senden</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="119"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="122"/>
<source>download_file_error_null_name</source>
<extracomment>Content name is null, can&apos;t download it !</extracomment>
<translation>Inhaltsname nicht gesetzt, herunterladen fehlgeschlagen!</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="127"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="130"/>
<source>download_file_error_unable_to_download</source>
<extracomment>Unable to download file of entry %1</extracomment>
<translation>Datei des Eintrags %1 konnte nicht heruntergeladen werden</translation>
@ -4921,13 +4921,13 @@ Ablauf: %1</translation>
<context>
<name>MessageSharedFilesInfos</name>
<message>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="40"/>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="41"/>
<source>no_shared_medias</source>
<extracomment>No media</extracomment>
<translation>Keine Medien</translation>
</message>
<message>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="42"/>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="43"/>
<source>no_shared_documents</source>
<extracomment>No document</extracomment>
<translation>Keine Dokumente</translation>
@ -5884,25 +5884,25 @@ Um sie in einem kommerziellen Projekt zu aktivieren, kontaktieren Sie uns bitte.
<translation>Auf %1 antworten</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="637"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="638"/>
<source>shared_medias_title</source>
<extracomment>Shared medias</extracomment>
<translation>Geteilte Medien</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="639"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="640"/>
<source>shared_documents_title</source>
<extracomment>Shared documents</extracomment>
<translation>Geteilte Dokumente</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="668"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="669"/>
<source>forward_to_title</source>
<extracomment>Forward to…</extracomment>
<translation>Weiterleiten an…</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="702"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="703"/>
<source>conversations_title</source>
<extracomment>Conversations</extracomment>
<translation>Chats</translation>

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

@ -2319,37 +2319,37 @@ Error</extracomment>
<context>
<name>ChatMessageContentModel</name>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="80"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="83"/>
<source>download_error_object_doesnt_exist</source>
<extracomment>Internal error : message object does not exist anymore !</extracomment>
<translation>Internal error : message object does not exist anymore !</translation>
<extracomment>Internal error : message object associated to this content does not exist anymore !</extracomment>
<translation>Internal error : message object associated to this content does not exist anymore !</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="95"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="98"/>
<source>download_file_server_error</source>
<extracomment>Error while trying to download content : %1</extracomment>
<translation>Error while trying to download content : %1</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="105"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="108"/>
<source>download_file_error_no_safe_file_path</source>
<extracomment>Unable to create safe file path for: %1</extracomment>
<translation>Unable to create safe file path for: %1</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="114"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="117"/>
<source>download_file_error_file_transfer_unavailable</source>
<extracomment>This file was already downloaded and is no more on the server. Your peer have to resend it if you want to get it</extracomment>
<translation>This file was already downloaded and is no more on the server. Your peer have to resend it if you want to get it</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="119"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="122"/>
<source>download_file_error_null_name</source>
<extracomment>Content name is null, can&apos;t download it !</extracomment>
<translation>Content name is null, can&apos;t download it !</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="127"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="130"/>
<source>download_file_error_unable_to_download</source>
<extracomment>Unable to download file of entry %1</extracomment>
<translation>Unable to download file of entry %1</translation>
@ -4815,13 +4815,13 @@ Expiration : %1</translation>
<context>
<name>MessageSharedFilesInfos</name>
<message>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="40"/>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="41"/>
<source>no_shared_medias</source>
<extracomment>No media</extracomment>
<translation>No media</translation>
</message>
<message>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="42"/>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="43"/>
<source>no_shared_documents</source>
<extracomment>No document</extracomment>
<translation>No document</translation>
@ -5761,25 +5761,25 @@ To enable them in a commercial project, please contact us.</translation>
<translation>Reply to %1</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="637"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="638"/>
<source>shared_medias_title</source>
<extracomment>Shared medias</extracomment>
<translation>Shared medias</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="639"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="640"/>
<source>shared_documents_title</source>
<extracomment>Shared documents</extracomment>
<translation>Shared documents</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="668"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="669"/>
<source>forward_to_title</source>
<extracomment>Forward to…</extracomment>
<translation>Froward to…</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="702"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="703"/>
<source>conversations_title</source>
<extracomment>Conversations</extracomment>
<translation>Conversations</translation>

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

@ -2294,37 +2294,37 @@ Error</extracomment>
<context>
<name>ChatMessageContentModel</name>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="80"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="83"/>
<source>download_error_object_doesnt_exist</source>
<extracomment>Internal error : message object does not exist anymore !</extracomment>
<translation>Erreur interne : l&apos;objet ChatMessage n&apos;existe plus !</translation>
<extracomment>Internal error : message object associated to this content does not exist anymore !</extracomment>
<translation>Erreur interne : le message associé à ce contenu n&apos;existe plus !</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="95"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="98"/>
<source>download_file_server_error</source>
<extracomment>Error while trying to download content : %1</extracomment>
<translation>Erreur en tentant de télécharger le contenu : %1</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="105"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="108"/>
<source>download_file_error_no_safe_file_path</source>
<extracomment>Unable to create safe file path for: %1</extracomment>
<translation>Impossible de créer le chemin : %1</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="114"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="117"/>
<source>download_file_error_file_transfer_unavailable</source>
<extracomment>This file was already downloaded and is no more on the server. Your peer have to resend it if you want to get it</extracomment>
<translation>Le fichier a déjà été téléchargé et n&apos;est plus disponible sur le serveur. Votre correspondant devra vous le renvoyez si vous souhaitez l&apos;obtenir</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="119"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="122"/>
<source>download_file_error_null_name</source>
<extracomment>Content name is null, can&apos;t download it !</extracomment>
<translation>Le nom du contenu est nul, impossible de le télécharger !</translation>
</message>
<message>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="127"/>
<location filename="../../model/chat/message/content/ChatMessageContentModel.cpp" line="130"/>
<source>download_file_error_unable_to_download</source>
<extracomment>Unable to download file of entry %1</extracomment>
<translation>Impossible de télécharger le fichier : %1</translation>
@ -4786,13 +4786,13 @@ Expiration : %1</translation>
<context>
<name>MessageSharedFilesInfos</name>
<message>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="40"/>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="41"/>
<source>no_shared_medias</source>
<extracomment>No media</extracomment>
<translation>Aucun média</translation>
</message>
<message>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="42"/>
<location filename="../../view/Page/Layout/Chat/MessageSharedFilesInfos.qml" line="43"/>
<source>no_shared_documents</source>
<extracomment>No document</extracomment>
<translation>Aucun document</translation>
@ -5732,25 +5732,25 @@ Pour les activer dans un projet commercial, merci de nous contacter.</translatio
<translation>Réponse à %1</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="637"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="638"/>
<source>shared_medias_title</source>
<extracomment>Shared medias</extracomment>
<translation>Médias partagés</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="639"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="640"/>
<source>shared_documents_title</source>
<extracomment>Shared documents</extracomment>
<translation>Documents partagés</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="668"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="669"/>
<source>forward_to_title</source>
<extracomment>Forward to…</extracomment>
<translation>Transférer à…</translation>
</message>
<message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="702"/>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="703"/>
<source>conversations_title</source>
<extracomment>Conversations</extracomment>
<translation>Conversations</translation>

5
Linphone/model/chat/message/content/ChatMessageContentModel.cpp
View file

@ -75,8 +75,11 @@ void ChatMessageContentModel::removeDownloadedFile(QString filePath) {
}
bool ChatMessageContentModel::downloadFile(const QString &name, QString *error) {
const QString filepath = Utils::getSafeFilePath(
QStringLiteral("%1%2").arg(App::getInstance()->getSettings()->getDownloadFolder()).arg(name), nullptr);
qDebug() << "try to download" << filepath;
if (!mChatMessageModel) {
//: Internal error : message object does not exist anymore !
//: Internal error : message object associated to this content does not exist anymore !
if (error) *error = tr("download_error_object_doesnt_exist");
return false;
}

2
Linphone/view/Control/Display/Chat/FileView.qml
View file

@ -270,7 +270,7 @@ Item {
EffectImage {
z: parent.z + 1
anchors.centerIn: parent
imageSource: defaultViewStack.imageSource
imageSource: mainItem.imageSource
width: Utils.getSizeWithScreenRatio(22)
height: width
colorizationColor: DefaultStyle.main2_600

1
Linphone/view/Page/Form/Chat/SelectedChatView.qml
View file

@ -632,6 +632,7 @@ FocusScope {
id: sharedFilesComponent
MessageSharedFilesInfos {
chatGui: mainItem.chat
showAsSquare: contentLoader.panelType === SelectedChatView.PanelType.Medias
title: contentLoader.panelType === SelectedChatView.PanelType.Medias
//: Shared medias
? qsTr("shared_medias_title")

3
Linphone/view/Page/Layout/Chat/MessageSharedFilesInfos.qml
View file

@ -10,6 +10,7 @@ MessageInfosLayout {
spacing: Utils.getSizeWithScreenRatio(25)
property ChatGui chatGui
property int filter
property bool showAsSquare: false
tabbar.visible: false
content: [
@ -43,7 +44,7 @@ MessageInfosLayout {
}
delegate: FileView {
contentGui: modelData
showAsSquare: false
showAsSquare: mainItem.showAsSquare
width: gridView.cellWidth - Utils.getSizeWithScreenRatio(2)
height: gridView.cellHeight - Utils.getSizeWithScreenRatio(2)
}