.gitlab-ci-files/macosx-desktop.yml

@@ -102,7 +102,7 @@ macosx-ninja-package:
     - if: $PACKAGE_MACOSX
     - if: $DEPLOY_MACOSX
   variables:
-    CMAKE_OPTIONS: -DPython3_ROOT_DIR=/opt/bc/pip-packages/ -DENABLE_APP_PACKAGING=ON -DENABLE_GPL_THIRD_PARTIES=OFF -DENABLE_G729=ON -DENABLE_BUGSPLAT_SYMBOLS_UPLOAD=ON -DBUGSPLAT_CLIENT_ID=$BUGSPLAT_CLIENT_ID -DBUGSPLAT_CLIENT_SECRET=$BUGSPLAT_CLIENT_SECRET -DBUGSPLAT_DATABASE=$BUGSPLAT_DATABASE
+    CMAKE_OPTIONS: -DPython3_ROOT_DIR=/opt/bc/pip-packages/ -DENABLE_APP_PACKAGING=ON -DENABLE_GPL_THIRD_PARTIES=OFF -DENABLE_G729=ON
     RELEASE_FILE: -DLINPHONE_SDK_MAKE_RELEASE_FILE_URL=$MAKE_RELEASE_FILE_URL/$MACOSX_PLATFORM/$APP_FOLDER
   extends: macosx-ninja
   script:

Linphone/core/chat/ChatCore.cpp

@@ -223,22 +223,10 @@ void ChatCore::setSelf(const QSharedPointer<ChatCore> &me) {
 	mChatModelConnection->makeConnectToModel(
 	    &ChatModel::chatMessagesReceived, [this](const std::shared_ptr<linphone::ChatRoom> &chatRoom,
 	                                             const std::list<std::shared_ptr<linphone::EventLog>> &eventsLog) {
-		    if (!mChatModel) {
-			    lWarning() << log().arg("Chat model is null !");
-			    return;
-		    } else if (!mChatModelConnection) {
-			    lWarning() << log().arg("Connection between Core and Model is null !");
-			    return;
-		    }
 		    if (mChatModel->getMonitor() != chatRoom) return;
-		    lInfo() << log().arg("Chat message received in chatroom") << this << mChatModel->getTitle();
+		    lDebug() << log().arg("CHAT MESSAGE RECEIVED IN CHATROOM") << this << mChatModel->getTitle();
-		    lInfo() << log().arg("Connection =") << mChatModelConnection.get();
 		    QList<QSharedPointer<EventLogCore>> list;
 		    for (auto &e : eventsLog) {
-			    if (!e) {
-				    lWarning() << log().arg("Event log is null, continue");
-				    continue;
-			    }
 			    auto event = EventLogCore::create(e, chatRoom);
 			    list.push_back(event);
 		    }
@@ -389,15 +377,6 @@ void ChatCore::setSelf(const QSharedPointer<ChatCore> &me) {
 			                                         setMeAdmin(meAdmin);
 		                                         });
 	                                         });
-	mChatModelConnection->makeConnectToModel(
-	    &ChatModel::participantAddressesChanged,
-	    [this](const std::shared_ptr<linphone::ChatRoom> &chatRoom, bool success) {
-		    if (!success) {
-			    auto participants = buildParticipants(chatRoom);
-			    mChatModelConnection->invokeToCore([this, participants] { setParticipants(participants); });
-		    }
-		    mChatModelConnection->invokeToCore([this, success] { emit participantAddressesChanged(success); });
-	    });
 	mChatModelConnection->makeConnectToCore(&ChatCore::lRemoveParticipantAtIndex, [this](int index) {
 		mChatModelConnection->invokeToModel([this, index]() { mChatModel->removeParticipantAtIndex(index); });
 	});

Linphone/core/chat/ChatCore.hpp

@@ -175,7 +175,6 @@ signals:
 	void fileListChanged();
 	void isSecuredChanged();
 	void conferenceJoined();
-	void participantAddressesChanged(bool success);
 
 	void lDeleteMessage(ChatMessageGui *message);
 	void lDelete();

Linphone/core/notifier/Notifier.cpp

@@ -366,8 +366,7 @@ void Notifier::notifyReceivedMessages(const std::shared_ptr<linphone::ChatRoom>
 				txt = tr("new_conference_invitation");
 		};
 
-		if (messages.size() == 1 &&
+		if (messages.size() == 1) { // Display only sender on mono message.
-		    SettingsModel::getInstance()->getDisplayNotificationContent()) { // Display only sender on mono message.
 			if (message->isRead()) return;
 			getMessage(message);
 			if (txt.isEmpty()) { // Do not notify message without content
@@ -383,9 +382,6 @@ void Notifier::notifyReceivedMessages(const std::shared_ptr<linphone::ChatRoom>
 				}
 			}
 			if (unreadCount == 0) return;
-			else if (unreadCount == 1)
-				//: 'New message received!' Notification that warn the user of a new message.
-				txt = tr("new_chat_room_message");
 			if (unreadCount > 1)
 				//: 'New messages received!' Notification that warn the user of new messages.
 				txt = tr("new_chat_room_messages");

Linphone/core/path/Paths.cpp

@@ -275,73 +275,71 @@ QString Paths::getLogsDirPath() {
 QString Paths::getAppRootCaFilePath() {
 	// Hardcoded because it comes from linphone and is not customizable.
 	return getReadableFilePath(getAppPackageDataDirPath() + "/linphone/rootca.pem");
-}
+	QString Paths::getCrashpadDirPath() {
-
-QString Paths::getCrashpadDirPath() {
 #ifdef HAVE_CRASH_HANDLER
-	return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) +
+		return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) +
-	                          Constants::PathCrashpad);
+		                          Constants::PathCrashpad);
 #else
-	return "";
+		return "";
 #endif
-}
+	}
 
-QString Paths::getMetricsDirPath() {
+	QString Paths::getMetricsDirPath() {
-	return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) +
+		return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) +
-	                          Constants::PathMetrics);
+		                          Constants::PathMetrics);
-}
+	}
 
-QString Paths::getMessageHistoryFilePath() {
+	QString Paths::getMessageHistoryFilePath() {
-	return getReadableFilePath(
+		return getReadableFilePath(
-	    getAppMessageHistoryFilePath()); // No need to ensure that the file exists as this DB is deprecated
+		    getAppMessageHistoryFilePath()); // No need to ensure that the file exists as this DB is deprecated
-}
+	}
 
-QString Paths::getPackageMsPluginsDirPath() {
+	QString Paths::getPackageMsPluginsDirPath() {
-	return getReadableDirPath(getAppPackageMsPluginsDirPath());
+		return getReadableDirPath(getAppPackageMsPluginsDirPath());
-}
+	}
 
-QString Paths::getPackagePluginsAppDirPath() {
+	QString Paths::getPackagePluginsAppDirPath() {
-	return getReadableDirPath(getAppPackagePluginsDirPath() + Constants::PathPluginsApp);
+		return getReadableDirPath(getAppPackagePluginsDirPath() + Constants::PathPluginsApp);
-}
+	}
 
-QString Paths::getPackageTopDirPath() {
+	QString Paths::getPackageTopDirPath() {
-	return getReadableDirPath(getAppPackageDataDirPath());
+		return getReadableDirPath(getAppPackageDataDirPath());
-}
+	}
 
-QString Paths::getPluginsAppDirPath() {
+	QString Paths::getPluginsAppDirPath() {
-	return getWritableDirPath(getAppPluginsDirPath() + Constants::PathPluginsApp);
+		return getWritableDirPath(getAppPluginsDirPath() + Constants::PathPluginsApp);
-}
+	}
 
-QStringList Paths::getPluginsAppFolders() {
+	QStringList Paths::getPluginsAppFolders() {
-	QStringList pluginPaths;
+		QStringList pluginPaths;
-	pluginPaths << Paths::getPluginsAppDirPath();
+		pluginPaths << Paths::getPluginsAppDirPath();
-	pluginPaths << Paths::getPackagePluginsAppDirPath();
+		pluginPaths << Paths::getPackagePluginsAppDirPath();
-	return pluginPaths;
+		return pluginPaths;
-}
+	}
 
-QString Paths::getToolsDirPath() {
+	QString Paths::getToolsDirPath() {
-	return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) +
+		return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) +
-	                          Constants::PathTools);
+		                          Constants::PathTools);
-}
+	}
-QString Paths::getUserCertificatesDirPath() {
+	QString Paths::getUserCertificatesDirPath() {
-	return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) +
+		return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) +
-	                          Constants::PathUserCertificates);
+		                          Constants::PathUserCertificates);
-}
+	}
 
-QString Paths::getZrtpSecretsFilePath() {
+	QString Paths::getZrtpSecretsFilePath() {
-	return getWritableFilePath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) +
+		return getWritableFilePath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) +
-	                           Constants::PathZrtpSecrets);
+		                           Constants::PathZrtpSecrets);
-}
+	}
 
-QString Paths::getCrashpadHandlerFilePath() {
+	QString Paths::getCrashpadHandlerFilePath() {
 #ifdef HAVE_CRASH_HANDLER
-	return getAppBinDirPath() + Constants::PathCrashpadHandler;
+		return getAppBinDirPath() + Constants::PathCrashpadHandler;
 #else
-	return "";
+		return "";
 #endif
-}
+	}
 
-// -----------------------------------------------------------------------------
+	// -----------------------------------------------------------------------------
 
-void Paths::migrate() {
+	void Paths::migrate() {
-}
+	}

Linphone/core/search/MagicSearchList.cpp

@@ -92,8 +92,6 @@ void MagicSearchList::setSelf(const QSharedPointer<MagicSearchList> &me) {
 			mModelConnection->makeConnectToModel(
 			    &MagicSearchModel::searchResultsReceived,
 			    [this](const std::list<std::shared_ptr<linphone::SearchResult>> &results) {
-				    lInfo() << log().arg("Search result received : Safe Connection =") << mModelConnection.get();
-				    lInfo() << log().arg("this =") << this;
 				    auto *contacts = new QList<QSharedPointer<FriendCore>>();
 				    auto ldapContacts = ToolModel::getLdapFriendList();
 				    auto core = CoreModel::getInstance()->getCore();

Linphone/core/setting/SettingsCore.cpp

@@ -50,7 +50,6 @@ SettingsCore::SettingsCore(QObject *parent) : QObject(parent) {
 	mVideoEnabled = settingsModel->getVideoEnabled();
 	mEchoCancellationEnabled = settingsModel->getEchoCancellationEnabled();
 	mAutoDownloadReceivedFiles = settingsModel->getAutoDownloadReceivedFiles();
-	mDisplayNotificationContent = settingsModel->getDisplayNotificationContent();
 	mAutomaticallyRecordCallsEnabled = settingsModel->getAutomaticallyRecordCallsEnabled();
 	mRingtonePath = settingsModel->getRingtone();
 	QFileInfo ringtone(mRingtonePath);
@@ -165,7 +164,6 @@ SettingsCore::SettingsCore(const SettingsCore &settingsCore) {
 	mVideoEnabled = settingsCore.mVideoEnabled;
 	mEchoCancellationEnabled = settingsCore.mEchoCancellationEnabled;
 	mAutoDownloadReceivedFiles = settingsCore.mAutoDownloadReceivedFiles;
-	mDisplayNotificationContent = settingsCore.mDisplayNotificationContent;
 	mAutomaticallyRecordCallsEnabled = settingsCore.mAutomaticallyRecordCallsEnabled;
 
 	// Audio
@@ -252,7 +250,6 @@ void SettingsCore::reloadSettings() {
 	setVideoEnabled(settingsModel->getVideoEnabled());
 	setEchoCancellationEnabled(settingsModel->getEchoCancellationEnabled());
 	setAutoDownloadReceivedFiles(settingsModel->getAutoDownloadReceivedFiles());
-	setDisplayNotificationContent(settingsModel->getDisplayNotificationContent());
 	setAutomaticallyRecordCallsEnabled(settingsModel->getAutomaticallyRecordCallsEnabled());
 	setRingtone(settingsModel->getRingtone());
 
@@ -403,12 +400,6 @@ void SettingsCore::setSelf(QSharedPointer<SettingsCore> me) {
 		    mSettingsModelConnection->invokeToCore([this, enabled]() { setAutoDownloadReceivedFiles(enabled); });
 	    });
 
-	// Auto download incoming files
-	mSettingsModelConnection->makeConnectToModel(
-	    &SettingsModel::displayNotificationContentChanged, [this](const bool enabled) {
-		    mSettingsModelConnection->invokeToCore([this, enabled]() { setDisplayNotificationContent(enabled); });
-	    });
-
 	// Auto recording
 	mSettingsModelConnection->makeConnectToModel(
 	    &SettingsModel::automaticallyRecordCallsEnabledChanged, [this](const bool enabled) {
@@ -649,7 +640,6 @@ void SettingsCore::reset(const SettingsCore &settingsCore) {
 	setAutomaticallyRecordCallsEnabled(settingsCore.mAutomaticallyRecordCallsEnabled);
 
 	setAutoDownloadReceivedFiles(settingsCore.mAutoDownloadReceivedFiles);
-	setDisplayNotificationContent(settingsCore.mDisplayNotificationContent);
 	// Audio
 	setCaptureDevices(settingsCore.mCaptureDevices);
 	setPlaybackDevices(settingsCore.mPlaybackDevices);
@@ -805,14 +795,6 @@ void SettingsCore::setAutoDownloadReceivedFiles(bool enabled) {
 	}
 }
 
-void SettingsCore::setDisplayNotificationContent(bool enabled) {
-	if (mDisplayNotificationContent != enabled) {
-		mDisplayNotificationContent = enabled;
-		emit displayNotificationContentChanged();
-		setIsSaved(false);
-	}
-}
-
 void SettingsCore::setAutomaticallyRecordCallsEnabled(bool enabled) {
 	if (mAutomaticallyRecordCallsEnabled != enabled) {
 		mAutomaticallyRecordCallsEnabled = enabled;
@@ -1259,8 +1241,6 @@ void SettingsCore::writeIntoModel(std::shared_ptr<SettingsModel> model) const {
 	// Chat
 	model->setAutoDownloadReceivedFiles(mAutoDownloadReceivedFiles);
 
-	model->setDisplayNotificationContent(mDisplayNotificationContent);
-
 	// Audio
 	model->setRingerDevice(mRingerDevice);
 	model->setCaptureDevice(mCaptureDevice);
@@ -1336,7 +1316,6 @@ void SettingsCore::writeFromModel(const std::shared_ptr<SettingsModel> &model) {
 
 	// Chat
 	mAutoDownloadReceivedFiles = model->getAutoDownloadReceivedFiles();
-	mDisplayNotificationContent = model->getDisplayNotificationContent();
 
 	// Audio
 	mCaptureDevices = model->getCaptureDevices();

Linphone/core/setting/SettingsCore.hpp

@@ -42,8 +42,6 @@ public:
 	               echoCancellationEnabledChanged)
 	Q_PROPERTY(bool autoDownloadReceivedFiles READ getAutoDownloadReceivedFiles WRITE setAutoDownloadReceivedFiles
 	               NOTIFY autoDownloadReceivedFilesChanged)
-	Q_PROPERTY(bool displayNotificationContent READ getDisplayNotificationContent WRITE setDisplayNotificationContent
-	               NOTIFY displayNotificationContentChanged)
 	Q_PROPERTY(
 	    int echoCancellationCalibration READ getEchoCancellationCalibration NOTIFY echoCancellationCalibrationChanged)
 	Q_PROPERTY(bool automaticallyRecordCallsEnabled READ getAutomaticallyRecordCallsEnabled WRITE
@@ -95,17 +93,18 @@ public:
 	Q_PROPERTY(bool fullLogsEnabled READ getFullLogsEnabled WRITE setFullLogsEnabled NOTIFY fullLogsEnabledChanged)
 	Q_PROPERTY(bool crashReporterEnabled READ getCrashReporterEnabled WRITE setCrashReporterEnabled NOTIFY
 	               crashReporterEnabledChanged)
-	Q_PROPERTY(QString logsEmail READ getLogsEmail) Q_PROPERTY(QString logsFolder READ getLogsFolder)
+	Q_PROPERTY(QString logsEmail READ getLogsEmail)
-	    Q_PROPERTY(QString ringtoneName READ getRingtoneFileName NOTIFY ringtoneChanged)
+	Q_PROPERTY(QString logsFolder READ getLogsFolder)
-	        Q_PROPERTY(QString ringtonePath READ getRingtonePath WRITE setRingtone NOTIFY ringtoneChanged)
+	Q_PROPERTY(QString ringtoneName READ getRingtoneFileName NOTIFY ringtoneChanged)
-	            Q_PROPERTY(QString ringtoneFolder MEMBER mRingtoneFolder NOTIFY ringtoneChanged)
+	Q_PROPERTY(QString ringtonePath READ getRingtonePath WRITE setRingtone NOTIFY ringtoneChanged)
-	                Q_PROPERTY(bool dnd READ dndEnabled WRITE lEnableDnd NOTIFY dndChanged)
+	Q_PROPERTY(QString ringtoneFolder MEMBER mRingtoneFolder NOTIFY ringtoneChanged)
-	                    Q_PROPERTY(bool isSaved READ isSaved WRITE setIsSaved NOTIFY isSavedChanged)
+	Q_PROPERTY(bool dnd READ dndEnabled WRITE lEnableDnd NOTIFY dndChanged)
+	Q_PROPERTY(bool isSaved READ isSaved WRITE setIsSaved NOTIFY isSavedChanged)
 
-	                        Q_PROPERTY(bool showAccountDevices READ showAccountDevices WRITE setShowAccountDevices
+	Q_PROPERTY(
-	                                       NOTIFY showAccountDevicesChanged)
+	    bool showAccountDevices READ showAccountDevices WRITE setShowAccountDevices NOTIFY showAccountDevicesChanged)
 
-	                            static QSharedPointer<SettingsCore> create();
+	static QSharedPointer<SettingsCore> create();
 	SettingsCore(QObject *parent = Q_NULLPTR);
 	SettingsCore(const SettingsCore &settingsCore);
 	virtual ~SettingsCore();
@@ -153,11 +152,6 @@ public:
 	}
 	void setAutoDownloadReceivedFiles(bool enabled);
 
-	bool getDisplayNotificationContent() {
-		return mDisplayNotificationContent;
-	}
-	void setDisplayNotificationContent(bool enabled);
-
 	bool getAutomaticallyRecordCallsEnabled() {
 		return mAutomaticallyRecordCallsEnabled;
 	}
@@ -315,7 +309,6 @@ signals:
 
 	void echoCancellationEnabledChanged();
 	void autoDownloadReceivedFilesChanged();
-	void displayNotificationContentChanged();
 
 	void automaticallyRecordCallsEnabledChanged();
 
@@ -413,7 +406,6 @@ private:
 	bool mVideoEnabled;
 	bool mEchoCancellationEnabled;
 	bool mAutoDownloadReceivedFiles;
-	bool mDisplayNotificationContent;
 	bool mAutomaticallyRecordCallsEnabled;
 
 	// Audio

Linphone/model/chat/ChatModel.cpp

@@ -237,23 +237,17 @@ void ChatModel::toggleParticipantAdminStatusAtIndex(int index) const {
 	mMonitor->setParticipantAdminStatus(participant, !participant->isAdmin());
 }
 
-void ChatModel::setParticipantAddresses(const QStringList &addresses) {
+void ChatModel::setParticipantAddresses(const QStringList &addresses) const {
 	QSet<QString> s{addresses.cbegin(), addresses.cend()};
-	bool soFarSoGood = true;
 	for (auto p : mMonitor->getParticipants()) {
 		auto address = Utils::coreStringToAppString(p->getAddress()->asStringUriOnly());
 		if (s.contains(address)) s.remove(address);
-		else {
+		else mMonitor->removeParticipant(p);
-			mMonitor->removeParticipants({p});
-		}
 	}
 	for (const auto &a : s) {
 		auto address = linphone::Factory::get()->createAddress(Utils::appStringToCoreString(a));
-		if (address) {
+		if (address) mMonitor->addParticipant(address);
-			soFarSoGood &= mMonitor->addParticipants({address});
-		}
 	}
-	emit participantAddressesChanged(mMonitor, soFarSoGood);
 }
 
 //---------------------------------------------------------------//

Linphone/model/chat/ChatModel.hpp

@@ -84,7 +84,7 @@ public:
 	void setEphemeralLifetime(int time);
 	void setSubject(QString subject) const;
 	void removeParticipantAtIndex(int index) const;
-	void setParticipantAddresses(const QStringList &addresses);
+	void setParticipantAddresses(const QStringList &addresses) const;
 	void toggleParticipantAdminStatusAtIndex(int index) const;
 
 signals:
@@ -94,7 +94,6 @@ signals:
 	void mutedChanged(bool muted);
 	void ephemeralEnableChanged(bool enable);
 	void ephemeralLifetimeChanged(int time);
-	void participantAddressesChanged(const std::shared_ptr<linphone::ChatRoom> &chatRoom, bool success);
 
 private:
 	DECLARE_ABSTRACT_OBJECT

Linphone/model/chat/message/ChatMessageModel.cpp

@@ -37,7 +37,6 @@ ChatMessageModel::ChatMessageModel(const std::shared_ptr<linphone::ChatMessage>
 	mEphemeralTimer.setInterval(60);
 	mEphemeralTimer.setSingleShot(false);
 	if (mMonitor->getEphemeralExpireTime() != 0) mEphemeralTimer.start();
-	mChatRoom = mMonitor->getChatRoom();
 	connect(&mEphemeralTimer, &QTimer::timeout, this,
 	        [this] { emit ephemeralMessageTimeUpdated(mMonitor, mMonitor->getEphemeralExpireTime()); });
 	connect(this, &ChatMessageModel::ephemeralMessageTimerStarted, this, [this] { mEphemeralTimer.start(); });
@@ -48,8 +47,7 @@ ChatMessageModel::ChatMessageModel(const std::shared_ptr<linphone::ChatMessage>
 	// We need to force this signal sending because there is no callback to know when a message has been read
 	connect(CoreModel::getInstance().get(), &CoreModel::chatRoomRead, this,
 	        [this](const std::shared_ptr<linphone::Core> &core, const std::shared_ptr<linphone::ChatRoom> &chatRoom) {
-		        if (!mMonitor || !mChatRoom.lock()) return;
+		        if (chatRoom == mMonitor->getChatRoom()) {
-		        if (chatRoom == mChatRoom.lock()) {
 			        if (mMonitor->isRead()) {
 				        emit messageRead(mMonitor);
 			        }

Linphone/model/conference/ConferenceInfoModel.cpp

@@ -33,7 +33,7 @@ DEFINE_ABSTRACT_OBJECT(ConferenceInfoModel)
 ConferenceInfoModel::ConferenceInfoModel(const std::shared_ptr<linphone::ConferenceInfo> &conferenceInfo,
                                          QObject *parent)
     // TODO : remove cloning when a fix will be done in SDK (#SDK-1001 ticket)
-    : mConferenceInfo(conferenceInfo) {
+    : mConferenceInfo(conferenceInfo->clone()) {
 	mustBeInLinphoneThread(getClassName());
 }
 

Linphone/model/setting/SettingsModel.cpp

@@ -521,17 +521,6 @@ void SettingsModel::setAutoDownloadReceivedFiles(bool status) {
 	emit autoDownloadReceivedFilesChanged(status);
 }
 
-bool SettingsModel::getDisplayNotificationContent() const {
-	mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
-	return !!mConfig->getInt(UiSection, "display_notification_content", 1);
-}
-
-void SettingsModel::setDisplayNotificationContent(bool display) {
-	mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
-	mConfig->setInt(UiSection, "display_notification_content", display);
-	emit displayNotificationContentChanged(display);
-}
-
 bool SettingsModel::getEchoCancellationEnabled() const {
 	mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
 	return CoreModel::getInstance()->getCore()->echoCancellationEnabled();

Linphone/model/setting/SettingsModel.hpp

@@ -66,9 +66,6 @@ public:
 	void setAutoDownloadReceivedFiles(bool enabled);
 	bool getAutoDownloadReceivedFiles() const;
 
-	void setDisplayNotificationContent(bool display);
-	bool getDisplayNotificationContent() const;
-
 	// Audio. --------------------------------------------------------------------
 
 	bool getIsInCall() const;
@@ -290,7 +287,6 @@ signals:
 
 	// Messages. --------------------------------------------------------------------
 	void autoDownloadReceivedFilesChanged(bool enabled);
-	void displayNotificationContentChanged(bool display);
 
 private:
 	void notifyConfigReady();

Linphone/tool/thread/SafeConnection.hpp

@@ -66,7 +66,7 @@ template <class A, class B>
 class SafeConnection : public QObject {
 	// Use create functions.
 protected:
-	SafeConnection(QSharedPointer<A> a, std::shared_ptr<B> b)
+	SafeConnection(const QSharedPointer<A> &a, std::shared_ptr<B> b)
 	    : mCore(a), mModel(b), mCoreObject(a.get()), mModelObject(b.get()) {
 	}
 	SafeConnection(QSharedPointer<A> a, QSharedPointer<B> b)
@@ -150,7 +150,6 @@ public:
 	}
 
 	bool tryLock() {
-		if (!this) return false;
 		mLocker.lock();
 		auto coreLocked = mCore.lock();
 		auto modelLocked = mModel.lock();

Linphone/view/Control/Display/Chat/ChatMessagesListView.qml

@@ -87,7 +87,6 @@ ListView {
         onModelAboutToBeReset: {
             loading = true
         }
-        onModelReset: loading = false
         onModelUpdated: {
             loading = false
             var index = eventLogProxy.findFirstUnreadIndex()

Linphone/view/Page/Layout/Chat/ManageParticipants.qml

@@ -22,22 +22,6 @@ Rectangle {
 	height: participantAddColumn.implicitHeight
 	signal done()
 
-	Connections {
-		enabled: chatGui !== null
-		target: chatGui.core
-		function onParticipantAddressesChanged(success) {
-			if (!success) UtilsCpp.showInformationPopup(qsTr("info_popup_error_title"), 
-			//: Error while setting participants !
-			qsTr("info_popup_manage_participant_error_message"), false)
-			else {
-				mainItem.done()
-				UtilsCpp.showInformationPopup(qsTr("info_popup_success_title"), 
-				//: Participants updated
-				qsTr("info_popup_manage_participant_updated_message"), true)
-			}
-		}
-	}
-
 	ColumnLayout {
 		id: participantAddColumn
 		anchors.fill: parent
@@ -52,6 +36,7 @@ Rectangle {
 				style: ButtonStyle.noBackground
 				icon.source: AppIcons.leftArrow
 				onClicked: {
+					mainItem.chatGui.core.lSetParticipantsAddresses(manageParticipantsLayout.selectedParticipants)
 					mainItem.done()
 				}
 			}
@@ -62,14 +47,6 @@ Rectangle {
 				font: Typography.h4
 				Layout.fillWidth: true
 			}
-			MediumButton {
-				id: manageParticipantsApplyButton
-				//: Apply
-				text: qsTr("apply_button_text")
-				onClicked: {
-					mainItem.chatGui.core.lSetParticipantsAddresses(manageParticipantsLayout.selectedParticipants)
-				}
-			}
 		}
 		AddParticipantsForm {
 			id: manageParticipantsLayout

Linphone/view/Page/Layout/Settings/ChatSettingsLayout.qml

@@ -15,13 +15,6 @@ AbstractSettingsLayout {
             subTitle: "",
 			contentComponent: attachedFilesParamComp,
 			// hideTopMargin: true
-		},
-		{
-            //: Notifications
-            title: qsTr("settings_chat_notifications_title"),
-            subTitle: "",
-			contentComponent: displayNotifParamComp,
-			// hideTopMargin: true
 		}
 	]
 
@@ -35,24 +28,6 @@ AbstractSettingsLayout {
 			propertyName: "autoDownloadReceivedFiles"
 			propertyOwner: SettingsCpp
 
-			Connections {
-				target: mainItem
-				function onSave() {
-					SettingsCpp.save()
-				}
-			}
-		}
-	}
-	Component {
-		id: displayNotifParamComp
-		SwitchSetting {
-			//: "Display notification content"
-			titleText: qsTr("settings_chat_display_notification_content_title")
-			//: "Display the content of the received message"
-			subTitleText: qsTr("settings_chat_display_notification_content_subtitle")
-			propertyName: "displayNotificationContent"
-			propertyOwner: SettingsCpp
-
 			Connections {
 				target: mainItem
 				function onSave() {

Linphone/view/Page/Main/Meeting/MeetingPage.qml

@@ -321,7 +321,7 @@ AbstractMainPage {
 								meetingSetup.conferenceInfoGui.core.save()
 								//: "Création de la réunion en cours …"
 								mainWindow.showLoadingPopup(qsTr("meeting_schedule_creation_in_progress"), true, function () {
-									meetingSetup.conferenceInfoGui.core.lCancelCreation()
+									meetingSetup.conferenceInfoGui.core.cancelCreation()
 								})
 							}
 						}

external/linphone-sdk

@@ -1 +1 @@
-Subproject commit 2e6e6b927ce202f6948da02ea33081a52b89bf48
+Subproject commit cbf282611d1d39dac1405a5a9388de0e8ee5b9e5