diff --git a/Linphone/core/notifier/Notifier.cpp b/Linphone/core/notifier/Notifier.cpp index 06c83f663..c37586ead 100644 --- a/Linphone/core/notifier/Notifier.cpp +++ b/Linphone/core/notifier/Notifier.cpp @@ -299,10 +299,14 @@ void Notifier::notifyReceivedCall(const shared_ptr &call) { auto model = CallCore::create(call); auto gui = new CallGui(model); gui->moveToThread(App::getInstance()->thread()); - App::postCoreAsync([this, gui]() { + QString displayName = call->getCallLog() && call->getCallLog()->getConferenceInfo() + ? Utils::coreStringToAppString(call->getCallLog()->getConferenceInfo()->getSubject()) + : Utils::coreStringToAppString(call->getRemoteAddress()->getDisplayName()); + App::postCoreAsync([this, gui, displayName]() { mustBeInMainThread(getClassName()); QVariantMap map; + map["displayName"].setValue(displayName); map["call"].setValue(gui); CREATE_NOTIFICATION(Notifier::ReceivedCall, map) }); diff --git a/Linphone/data/languages/de.ts b/Linphone/data/languages/de.ts index 45c9799a9..dd6063e47 100644 --- a/Linphone/data/languages/de.ts +++ b/Linphone/data/languages/de.ts @@ -2143,79 +2143,79 @@ Error - + chat_dialog_delete_chat_title Supprimer la conversation ? - + chat_dialog_delete_chat_message "La conversation et tous ses messages seront supprimés." - + chat_list_title "Conversations" - + menu_mark_all_as_read "mark all as read" - + chat_search_in_history "Rechercher une conversation" - + list_filter_no_result_found "Aucun résultat…" - + chat_list_empty_history "Aucune conversation dans votre historique" - + chat_action_start_new_chat "New chat" - + chat_start_group_chat_title "Nouveau groupe" - + chat_action_start_group_chat "Créer" - - + + information_popup_error_title - + group_chat_error_must_have_name "Un nom doit être donné au groupe - + group_call_error_not_connected "Vous n'etes pas connecté" Sie sind nicht verbunden @@ -4303,19 +4303,19 @@ Error NotificationReceivedCall - + call_audio_incoming "Appel entrant" Eingehender Anruf - + dialog_accept "Accepter" Akzeptieren - + dialog_deny "Refuser Ablehnen @@ -4324,24 +4324,24 @@ Error Notifier - + new_voice_message 'Voice message received!' : message to warn the user in a notofication for voice messages. - + new_file_message - + new_conference_invitation 'Conference invitation received!' : Notification about receiving an invitation to a conference. - + new_chat_room_messages 'New messages received!' Notification that warn the user of new messages. diff --git a/Linphone/data/languages/en.ts b/Linphone/data/languages/en.ts index 93a60216d..8bde3adbf 100644 --- a/Linphone/data/languages/en.ts +++ b/Linphone/data/languages/en.ts @@ -2106,79 +2106,79 @@ Only your correspondent can decrypt them. No conversation - + chat_dialog_delete_chat_title Supprimer la conversation ? Delete conversation ? - + chat_dialog_delete_chat_message "La conversation et tous ses messages seront supprimés." This conversation and all its messages will be deleted. - + chat_list_title "Conversations" Conversations - + menu_mark_all_as_read "mark all as read" Mark all as read - + chat_search_in_history "Rechercher une conversation" Search for a chat - + list_filter_no_result_found "Aucun résultat…" No result… - + chat_list_empty_history "Aucune conversation dans votre historique" No conversation in history - + chat_action_start_new_chat "New chat" New conversation - + chat_start_group_chat_title "Nouveau groupe" New group - + chat_action_start_group_chat "Créer" Create - - + + information_popup_error_title Error - + group_chat_error_must_have_name "Un nom doit être donné au groupe A name must be set for the group - + group_call_error_not_connected "Vous n'etes pas connecté" You are not connected @@ -4204,19 +4204,19 @@ Expiration : %1 NotificationReceivedCall - + call_audio_incoming "Appel entrant" Incoming call - + dialog_accept "Accepter" Accept - + dialog_deny "Refuser Decline @@ -4225,24 +4225,24 @@ Expiration : %1 Notifier - + new_voice_message 'Voice message received!' : message to warn the user in a notofication for voice messages. Voice message received! - + new_file_message File received! - + new_conference_invitation 'Conference invitation received!' : Notification about receiving an invitation to a conference. Conference invitation received ! - + new_chat_room_messages 'New messages received!' Notification that warn the user of new messages. New messages received ! diff --git a/Linphone/data/languages/fr_FR.ts b/Linphone/data/languages/fr_FR.ts index 6313d2bbc..4d963cb8a 100644 --- a/Linphone/data/languages/fr_FR.ts +++ b/Linphone/data/languages/fr_FR.ts @@ -2106,79 +2106,79 @@ en bout. Seul votre correspondant peut les déchiffrer. Aucune conversation - + chat_dialog_delete_chat_title Supprimer la conversation ? Supprimer la conversation ? - + chat_dialog_delete_chat_message "La conversation et tous ses messages seront supprimés." La conversation et tous ses messages seront supprimés. - + chat_list_title "Conversations" Conversations - + menu_mark_all_as_read "mark all as read" Tout marquer comme lu - + chat_search_in_history "Rechercher une conversation" Rechercher une conversation - + list_filter_no_result_found "Aucun résultat…" Aucun résultat… - + chat_list_empty_history "Aucune conversation dans votre historique" Aucune conversation dans votre historique - + chat_action_start_new_chat "New chat" Nouvelle conversation - + chat_start_group_chat_title "Nouveau groupe" Nouveau groupe - + chat_action_start_group_chat "Créer" Créer - - + + information_popup_error_title Erreur - + group_chat_error_must_have_name "Un nom doit être donné au groupe Un nom doit être donné au groupe - + group_call_error_not_connected "Vous n'etes pas connecté" Vous n'êtes pas connecté @@ -4204,19 +4204,19 @@ Expiration : %1 NotificationReceivedCall - + call_audio_incoming "Appel entrant" Appel entrant - + dialog_accept "Accepter" Accepter - + dialog_deny "Refuser Refuser @@ -4225,24 +4225,24 @@ Expiration : %1 Notifier - + new_voice_message 'Voice message received!' : message to warn the user in a notofication for voice messages. Message vocal reçu ! - + new_file_message Fichier reçu ! - + new_conference_invitation 'Conference invitation received!' : Notification about receiving an invitation to a conference. Nouvelle invitation à une conférence ! - + new_chat_room_messages 'New messages received!' Notification that warn the user of new messages. Nouveaux messages reçus ! diff --git a/Linphone/model/conference/ConferenceModel.cpp b/Linphone/model/conference/ConferenceModel.cpp index 81cc68ad0..327a36ba9 100644 --- a/Linphone/model/conference/ConferenceModel.cpp +++ b/Linphone/model/conference/ConferenceModel.cpp @@ -265,7 +265,7 @@ void ConferenceModel::onParticipantDeviceScreenSharingChanged( void ConferenceModel::onStateChanged(const std::shared_ptr &conference, linphone::Conference::State newState) { - lDebug() << "onStateChanged:" << (int)newState; + lDebug() << log().arg("onStateChanged:") << (int)newState; if (newState == linphone::Conference::State::Created) { emit participantDeviceCountChanged(conference, mMonitor->getParticipantDeviceList().size()); if (mMonitor->getScreenSharingParticipant()) emit isScreenSharingEnabledChanged(true); diff --git a/Linphone/model/core/CoreModel.cpp b/Linphone/model/core/CoreModel.cpp index 92a5a7da6..7915cf189 100644 --- a/Linphone/model/core/CoreModel.cpp +++ b/Linphone/model/core/CoreModel.cpp @@ -426,7 +426,10 @@ void CoreModel::onCallStateChanged(const std::shared_ptr &core, QString command = Utils::coreStringToAppString( core->getConfig()->getString(SettingsModel::UiSection, "command_line", "")); QString userName = Utils::coreStringToAppString(call->getRemoteAddress()->getUsername()); - QString displayName = Utils::coreStringToAppString(call->getRemoteAddress()->getDisplayName()); + QString displayName = + call->getCallLog() && call->getCallLog()->getConferenceInfo() + ? Utils::coreStringToAppString(call->getCallLog()->getConferenceInfo()->getSubject()) + : Utils::coreStringToAppString(call->getRemoteAddress()->getDisplayName()); command = command.replace("$1", userName); command = command.replace("$2", displayName); Utils::runCommandLine(command); diff --git a/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml b/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml index 796ed39a3..ff3269a85 100644 --- a/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml +++ b/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml @@ -15,8 +15,11 @@ Notification { overriddenHeight: content.height readonly property var call: notificationData && notificationData.call + readonly property var displayName: notificationData && notificationData.displayName property var state: call.core.state property var status: call.core.status + property var conference: call.core.conference + onStateChanged:{ if (state != LinphoneEnums.CallState.IncomingReceived){ close() @@ -72,7 +75,7 @@ Notification { ColumnLayout { spacing: 0 Text { - text: call.core.remoteName + text: displayName Layout.fillWidth: true Layout.maximumWidth: mainItem.width - content.leftPadding - content.rightPadding Layout.alignment: Qt.AlignHCenter