From d9daa4ba641b07dcb78e6fb8999ee9be5a93a362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20Bari?= Date: Wed, 17 Dec 2025 15:52:34 +0100 Subject: [PATCH] fix: Restore server subscription per account from config. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tamás Bari --- src/gui/accountmanager.cpp | 3 +++ src/gui/application.cpp | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index 3e269c1667719..6334a448c91da 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -642,6 +642,9 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings) acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString(); acc->_serverColor = settings.value(QLatin1String(serverColorC)).value(); acc->_serverTextColor = settings.value(QLatin1String(serverTextColorC)).value(); + acc->_serverHasValidSubscription = settings.value(QLatin1String(serverHasValidSubscriptionC), false).value(); + acc->_enterpriseUpdateChannel = UpdateChannel::fromString( + settings.value(QLatin1String(serverDesktopEnterpriseUpdateChannelC), QVariant::fromValue(UpdateChannel::Invalid.toString())).toString()); acc->_skipE2eeMetadataChecksumValidation = settings.value(QLatin1String(skipE2eeMetadataChecksumValidationC), {}).toBool(); acc->_davUser = settings.value(QLatin1String(davUserC)).toString(); diff --git a/src/gui/application.cpp b/src/gui/application.cpp index bea238ecc0a79..1454d93040963 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -295,10 +295,6 @@ Application::Application(int &argc, char **argv) setupConfigFile(); } - // In the config, set the enterprise update channel to invalid, so it can be bumped up - // when recieving server capabilities. - ConfigFile().setDesktopEnterpriseChannel(UpdateChannel::Invalid.toString()); - if (_theme->doNotUseProxy()) { ConfigFile().setProxyType(QNetworkProxy::NoProxy); const auto &allAccounts = AccountManager::instance()->accounts();