Skip to content

Commit d9daa4b

Browse files
committed
fix: Restore server subscription per account from config.
Signed-off-by: Tamás Bari <[email protected]>
1 parent efbba73 commit d9daa4b

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/gui/accountmanager.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,9 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
642642
acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString();
643643
acc->_serverColor = settings.value(QLatin1String(serverColorC)).value<QColor>();
644644
acc->_serverTextColor = settings.value(QLatin1String(serverTextColorC)).value<QColor>();
645+
acc->_serverHasValidSubscription = settings.value(QLatin1String(serverHasValidSubscriptionC), false).value<bool>();
646+
acc->_enterpriseUpdateChannel = UpdateChannel::fromString(
647+
settings.value(QLatin1String(serverDesktopEnterpriseUpdateChannelC), QVariant::fromValue(UpdateChannel::Invalid.toString())).toString());
645648
acc->_skipE2eeMetadataChecksumValidation = settings.value(QLatin1String(skipE2eeMetadataChecksumValidationC), {}).toBool();
646649
acc->_davUser = settings.value(QLatin1String(davUserC)).toString();
647650

src/gui/application.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,6 @@ Application::Application(int &argc, char **argv)
295295
setupConfigFile();
296296
}
297297

298-
// In the config, set the enterprise update channel to invalid, so it can be bumped up
299-
// when recieving server capabilities.
300-
ConfigFile().setDesktopEnterpriseChannel(UpdateChannel::Invalid.toString());
301-
302298
if (_theme->doNotUseProxy()) {
303299
ConfigFile().setProxyType(QNetworkProxy::NoProxy);
304300
const auto &allAccounts = AccountManager::instance()->accounts();

0 commit comments

Comments
 (0)