From b3135ea17713885f16fd38277ed3190ad8e6a2ec Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Mon, 27 Oct 2025 14:22:41 +0100 Subject: [PATCH] Fixes: fix wrong thread function call hide recordings button while not implemented display error message if cannot retrieve remote provisioning --- Linphone/core/call/CallCore.cpp | 8 ++++---- Linphone/data/languages/de.ts | 18 ++++++++++++++++-- Linphone/data/languages/en.ts | 18 ++++++++++++++++-- Linphone/data/languages/fr.ts | 18 ++++++++++++++++-- Linphone/model/core/CoreModel.cpp | 5 ++++- Linphone/view/Page/Layout/Main/MainLayout.qml | 2 +- 6 files changed, 57 insertions(+), 12 deletions(-) diff --git a/Linphone/core/call/CallCore.cpp b/Linphone/core/call/CallCore.cpp index cb7acb750..3058c61ce 100644 --- a/Linphone/core/call/CallCore.cpp +++ b/Linphone/core/call/CallCore.cpp @@ -204,15 +204,15 @@ void CallCore::setSelf(QSharedPointer me) { }); mCallModelConnection->makeConnectToModel( &CallModel::recordingChanged, [this](const std::shared_ptr &call, bool recording) { - mCallModelConnection->invokeToCore([this, recording]() { + auto recordFile = QString::fromStdString(mCallModel->getRecordFile()); + mCallModelConnection->invokeToCore([this, recording, recordFile]() { setRecording(recording); if (recording == false) { //: "Enregistrement terminé" Utils::showInformationPopup(tr("call_record_end_message"), //: "L'appel a été enregistré dans le fichier : %1" - tr("call_record_saved_in_file_message") - .arg(QString::fromStdString(mCallModel->getRecordFile())), - true, App::getInstance()->getCallsWindow()); + tr("call_record_saved_in_file_message").arg(recordFile), true, + App::getInstance()->getCallsWindow()); } }); }); diff --git a/Linphone/data/languages/de.ts b/Linphone/data/languages/de.ts index ab6438412..bbde498bb 100644 --- a/Linphone/data/languages/de.ts +++ b/Linphone/data/languages/de.ts @@ -773,13 +773,13 @@ CallCore - + call_record_end_message "Enregistrement terminé" Aufnahme beendet - + call_record_saved_in_file_message "L'appel a été enregistré dans le fichier : %1" Die Aufnahme wurde in der folgenden Datei gespeichert: %1 @@ -3445,6 +3445,20 @@ Error Alle Nachrichten werden aus dem Chat entfernt. Möchten Sie fortfahren? + + CoreModel + + + info_popup_error_title + Fehler + + + + fetching_config_failed_error_message + "Remote provisioning cannot be retrieved" + + + CreationFormLayout diff --git a/Linphone/data/languages/en.ts b/Linphone/data/languages/en.ts index d20d254be..fda47b387 100644 --- a/Linphone/data/languages/en.ts +++ b/Linphone/data/languages/en.ts @@ -768,13 +768,13 @@ CallCore - + call_record_end_message "Enregistrement terminé" Recording ended - + call_record_saved_in_file_message "L'appel a été enregistré dans le fichier : %1" Recording has been saved in file : %1 @@ -3349,6 +3349,20 @@ Only your correspondent can decrypt them. All the messages will be removed from the chat room. Do you want to continue ? + + CoreModel + + + info_popup_error_title + Error + + + + fetching_config_failed_error_message + "Remote provisioning cannot be retrieved" + Remote provisioning cannot be retrieved + + CreationFormLayout diff --git a/Linphone/data/languages/fr.ts b/Linphone/data/languages/fr.ts index c6c66486e..8aa4912fa 100644 --- a/Linphone/data/languages/fr.ts +++ b/Linphone/data/languages/fr.ts @@ -768,13 +768,13 @@ CallCore - + call_record_end_message "Enregistrement terminé" Enregistrement terminé - + call_record_saved_in_file_message "L'appel a été enregistré dans le fichier : %1" L'appel a été enregistré dans le fichier : %1 @@ -3349,6 +3349,20 @@ en bout. Seul votre correspondant peut les déchiffrer. Tous les messages seront supprimés. Souhaitez-vous continuer ? + + CoreModel + + + info_popup_error_title + Erreur + + + + fetching_config_failed_error_message + "Remote provisioning cannot be retrieved" + La configuration distante n'a pas pu être récupérée + + CreationFormLayout diff --git a/Linphone/model/core/CoreModel.cpp b/Linphone/model/core/CoreModel.cpp index cd8096a20..143524322 100644 --- a/Linphone/model/core/CoreModel.cpp +++ b/Linphone/model/core/CoreModel.cpp @@ -216,7 +216,10 @@ QString CoreModel::getFetchConfig(QString filePath, bool *error) { if (!filePath.isEmpty()) filePath = "file://" + filePath; } if (filePath.isEmpty()) { - qWarning() << "Remote provisionning cannot be retrieved. Command have been cleaned"; + qWarning() << "Remote provisioning cannot be retrieved. Command have been cleaned"; + Utils::showInformationPopup(tr("info_popup_error_title"), + //: "Remote provisioning cannot be retrieved" + tr("fetching_config_failed_error_message"), false); *error = true; } } diff --git a/Linphone/view/Page/Layout/Main/MainLayout.qml b/Linphone/view/Page/Layout/Main/MainLayout.qml index bd31603fe..6f94bb336 100644 --- a/Linphone/view/Page/Layout/Main/MainLayout.qml +++ b/Linphone/view/Page/Layout/Main/MainLayout.qml @@ -494,7 +494,7 @@ Item { IconLabelButton { id: recordsButton Layout.fillWidth: true - visible: !SettingsCpp.disableCallRecordings + visible: false// !SettingsCpp.disableCallRecordings icon.width: Utils.getSizeWithScreenRatio(32) icon.height: Utils.getSizeWithScreenRatio(32) //: "Enregistrements"