From 1d4c3f2518a91c2ecda8b63feeaadde6b6331cba Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Fri, 24 Mar 2023 10:12:07 +0100
Subject: [PATCH] Fix registration expiration that was set on publish and not
 on register.

---
 .../src/components/settings/AccountSettingsModel.cpp       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/linphone-app/src/components/settings/AccountSettingsModel.cpp b/linphone-app/src/components/settings/AccountSettingsModel.cpp
index 953dc618d..79c888893 100644
--- a/linphone-app/src/components/settings/AccountSettingsModel.cpp
+++ b/linphone-app/src/components/settings/AccountSettingsModel.cpp
@@ -149,7 +149,8 @@ QVariantMap AccountSettingsModel::getAccountDescription (const shared_ptr<linpho
 			: QString("");
 	
 	map["serverAddress"] = Utils::coreStringToAppString(accountParams->getServerAddress()->asString());
-	map["registrationDuration"] = accountParams->getPublishExpires();
+	map["registrationDuration"] = accountParams->getExpires();
+	map["publishDuration"] = accountParams->getPublishExpires();
 	
 	if( map["serverAddress"].toString().toUpper().contains("TRANSPORT="))// transport has been specified : let the RFC select the transport
 		map["transport"] = LinphoneEnums::toString(LinphoneEnums::fromLinphone(accountParams->getTransport()));
@@ -317,7 +318,9 @@ bool AccountSettingsModel::addOrUpdateAccount(
 	}
 	
 	if(data.contains("registrationDuration"))
-		accountParams->setPublishExpires(data["registrationDuration"].toInt());
+		accountParams->setExpires(data["registrationDuration"].toInt());
+	if(data.contains("publishDuration"))
+		accountParams->setPublishExpires(data["publishDuration"].toInt());
 	if(data.contains("route")) {
 		std::list<std::shared_ptr<linphone::Address>> routes;
 		routes.push_back(Utils::interpretUrl(data["route"].toString()));