From 1f96259c16e2fd4b00c57e81a31a7e242ed59066 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 6 May 2025 10:50:30 +0200 Subject: [PATCH] File transfer migration --- .../assistant/create-app-sip-account.rc | 2 +- .../assets/assistant/use-app-sip-account.rc | 2 +- .../src/components/core/CoreManager.cpp | 24 ++++++++++++++++++- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/linphone-app/assets/assistant/create-app-sip-account.rc b/linphone-app/assets/assistant/create-app-sip-account.rc index a23f4995a..53410bd60 100644 --- a/linphone-app/assets/assistant/create-app-sip-account.rc +++ b/linphone-app/assets/assistant/create-app-sip-account.rc @@ -29,7 +29,7 @@ stun,ice
- https://www.linphone.org:444/lft.php + https://files.linphone.org/http-file-transfer-server/hft.php
sips:rls@sip.linphone.org diff --git a/linphone-app/assets/assistant/use-app-sip-account.rc b/linphone-app/assets/assistant/use-app-sip-account.rc index 4e6917299..fb2af3bdb 100644 --- a/linphone-app/assets/assistant/use-app-sip-account.rc +++ b/linphone-app/assets/assistant/use-app-sip-account.rc @@ -29,7 +29,7 @@ stun,ice
- https://www.linphone.org:444/lft.php + https://files.linphone.org/http-file-transfer-server/hft.php
sips:rls@sip.linphone.org diff --git a/linphone-app/src/components/core/CoreManager.cpp b/linphone-app/src/components/core/CoreManager.cpp index 238cf70b9..1c75faadf 100644 --- a/linphone-app/src/components/core/CoreManager.cpp +++ b/linphone-app/src/components/core/CoreManager.cpp @@ -320,6 +320,21 @@ void CoreManager::migrate () { shared_ptr config = mCore->getConfig(); auto oldLimeServerUrl = mCore->getLimeX3DhServerUrl();// core url is deprecated : If core url exists, it must be copied to all linphone accounts. int rcVersion = config->getInt(SettingsModel::UiSection, Constants::RcVersionName, 0); + if (rcVersion >= 7) {// Update old factories data + // From v7, RetiredUploadLogsServer should never be used. Replace it if found. + auto logServer = mCore->getLogCollectionUploadServerUrl(); + if ( logServer == Constants::RetiredUploadLogsServer) { + mCore->setLogCollectionUploadServerUrl(Constants::DefaultUploadLogsServer); + qInfo() << "Migrating overall from v7 : replacing old Log URL" << Utils::coreStringToAppString(logServer); + } + auto fileServer = mCore->getFileTransferServer(); + if (fileServer == Constants::RetiredUploadLogsServer){ + mCore->setFileTransferServer(Constants::DefaultUploadLogsServer); + qInfo() << "Migrating overall from v7 : replacing old File transfer URL" << Utils::coreStringToAppString(fileServer); + } + } + + if( !oldLimeServerUrl.empty()) { mCore->setLimeX3DhServerUrl(""); mCore->enableLimeX3Dh(true); @@ -386,7 +401,14 @@ void CoreManager::migrate () { if (logServer.empty() || logServer == Constants::RetiredUploadLogsServer) { mCore->setLogCollectionUploadServerUrl(Constants::DefaultUploadLogsServer); qInfo() << "Migrating" << accountIdentity - << "for version 7. Setting Log collection upload server rul to: " + << "for version 7. Setting Log collection upload server url to: " + << Constants::DefaultUploadLogsServer; + } + auto fileServer = mCore->getFileTransferServer(); + if (fileServer.empty() || fileServer == Constants::RetiredUploadLogsServer) { + mCore->setFileTransferServer(Constants::DefaultUploadLogsServer); + qInfo() << "Migrating" << accountIdentity + << "for version 7. Setting File transfer upload server url to: " << Constants::DefaultUploadLogsServer; } }