From 569589751302e3baadef1f3d4f8c657101822ca1 Mon Sep 17 00:00:00 2001
From: Andrea Gianarda <andrea.gianarda@belledonne-communications.com>
Date: Thu, 27 Jun 2024 12:35:57 +0200
Subject: [PATCH] Update SDK and fix compile errors due to changes in the SDK
 public API

---
 linphone-app/src/app/cli/Cli.cpp              | 55 ++++++++-----------
 .../src/components/calls/CallsListModel.cpp   | 12 +---
 linphone-sdk                                  |  2 +-
 3 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/linphone-app/src/app/cli/Cli.cpp b/linphone-app/src/app/cli/Cli.cpp
index 39e977a71..6cb9c0619 100644
--- a/linphone-app/src/app/cli/Cli.cpp
+++ b/linphone-app/src/app/cli/Cli.cpp
@@ -153,29 +153,27 @@ static void cliInitiateConference (QHash<QString, QString> &args) {
 	shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
 
 	// Check identity.
-	{
-		shared_ptr<linphone::Address> address = core->interpretUrl(Utils::appStringToCoreString(args["sip-address"]));
-		if (!address || address->getUsername().empty()) {
-			qWarning() << QStringLiteral("Unable to parse invalid sip address.");
-			return;
-		}
-
-		address->clean();
-
-		shared_ptr<linphone::Account> account = core->getDefaultAccount();
-		if (!account) {
-			qWarning() << QStringLiteral("Not connected to an account");
-			return;
-		}
-		if (!account->getParams()->getIdentityAddress()->weakEqual(address)) {
-			qWarning() << QStringLiteral("Received different sip address from identity : `%1 != %2`.")
-						  .arg(Utils::coreStringToAppString(account->getParams()->getIdentityAddress()->asString()))
-						  .arg(Utils::coreStringToAppString(address->asString()));
-			return;
-		}
+	shared_ptr<linphone::Address> address = core->interpretUrl(Utils::appStringToCoreString(args["sip-address"]));
+	if (!address || address->getUsername().empty()) {
+		qWarning() << QStringLiteral("Unable to parse invalid sip address.");
+		return;
 	}
 
-	shared_ptr<linphone::Conference> conference = core->getConference();
+	address->clean();
+
+	shared_ptr<linphone::Account> account = core->getDefaultAccount();
+	if (!account) {
+		qWarning() << QStringLiteral("Not connected to an account");
+		return;
+	}
+	if (!account->getParams()->getIdentityAddress()->weakEqual(address)) {
+		qWarning() << QStringLiteral("Received different sip address from identity : `%1 != %2`.")
+					  .arg(Utils::coreStringToAppString(account->getParams()->getIdentityAddress()->asString()))
+					  .arg(Utils::coreStringToAppString(address->asString()));
+		return;
+	}
+
+	shared_ptr<linphone::Conference> conference = core->searchConference(address);
 	const QString id = args["conference-id"];
 
 	auto updateCallsWindow = []() {
@@ -192,24 +190,17 @@ static void cliInitiateConference (QHash<QString, QString> &args) {
 	};
 
 	if (conference) {
-		if (conference->getId() == Utils::appStringToCoreString(id)) {
-			qInfo() << QStringLiteral("Conference `%1` already exists.").arg(id);
-			updateCallsWindow();
-			return;
-		}
-
-		qInfo() << QStringLiteral("Remove existing conference with id: `%1`.")
-				   .arg(Utils::coreStringToAppString(conference->getId()));
-		core->terminateConference();
+		qInfo() << QStringLiteral("Conference `%1` already exists.").arg(Utils::coreStringToAppString(conference->getConferenceAddress()->asString()));
+		updateCallsWindow();
+		return;
 	}
 
 	qInfo() << QStringLiteral("Create conference with id: `%1`.").arg(id);
 	auto confParameters = core->createConferenceParams(conference);
 	confParameters->enableVideo(false);// Video is not yet fully supported by the application in conference
 	conference = core->createConferenceWithParams(confParameters);
-	conference->setId(Utils::appStringToCoreString(id));
 
-	if (core->enterConference() == -1) {
+	if (conference->enter() == -1) {
 		qWarning() << QStringLiteral("Unable to join created conference: `%1`.").arg(id);
 		return;
 	}
diff --git a/linphone-app/src/components/calls/CallsListModel.cpp b/linphone-app/src/components/calls/CallsListModel.cpp
index f52572d3a..643ddc2f3 100644
--- a/linphone-app/src/components/calls/CallsListModel.cpp
+++ b/linphone-app/src/components/calls/CallsListModel.cpp
@@ -567,17 +567,7 @@ static void joinConference (const shared_ptr<linphone::Call> &call) {
 		qWarning() << QStringLiteral("Not in a conference. => Responding to `join-conference` as a simple call...");
 		return;
 	}
-	
-	shared_ptr<linphone::Conference> conference = core->getConference();
-	const QString conferenceId = Utils::coreStringToAppString(call->getToHeader("conference-id"));
-	
-	if (conference->getId() != Utils::appStringToCoreString(conferenceId)) {
-		qWarning() << QStringLiteral("Trying to join conference with an invalid conference id: `%1`. Responding as a simple call...")
-					  .arg(conferenceId);
-		return;
-	}
-	qInfo() << QStringLiteral("Join conference: `%1`.").arg(conferenceId);
-	
+
 	ConferenceHelperModel helperModel;
 	ConferenceHelperModel::ConferenceAddModel *addModel = helperModel.getConferenceAddModel();
 	if(call->dataExists("call-model")){
diff --git a/linphone-sdk b/linphone-sdk
index 1f9db257f..280aea931 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit 1f9db257fe224ea6d9b067e69ee6b9f72102e129
+Subproject commit 280aea931a383a33851547bce5083ea22676f148