mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-23 04:45:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Separate the list of valid update channels for enterprise and non-enterprise.

Browse source 
Signed-off-by: Camila Ayres <hello@camilasan.com>
This commit is contained in:
Camila Ayres 2024-07-03 23:31:53 +02:00
parent e51324dc9a
commit 52e15ff92e
No known key found for this signature in database
GPG key ID: 7A4A6121E88E2AD4
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/libsync/configfile.cpp
View file

@ -110,11 +110,13 @@ static constexpr char forceLoginV2C[] = "forceLoginV2";
static constexpr char certPath[] = "http_certificatePath";
static constexpr char certPasswd[] = "http_certificatePasswd";
static const QStringList defaultUpdateChannelsList { QStringLiteral("stable"), QStringLiteral("beta"), QStringLiteral("daily") };
static constexpr QString defaultUpdateChannelName = "stable";
static constexpr char defaultEnterpriseChannel[] = "enterprise";
static constexpr char serverHasValidSubscriptionC[] = "serverHasValidSubscription";
static constexpr char desktopEnterpriseChannelName[] = "desktopEnterpriseChannel";
static const QStringList defaultUpdateChannelsList { QStringLiteral("stable"), QStringLiteral("beta"), QStringLiteral("daily") };
static const QString defaultUpdateChannelName = "stable";
static const QStringList enterpriseUpdateChannelsList { QStringLiteral("stable"), QStringLiteral("enterprise") };
static const QString defaultEnterpriseChannel = "enterprise";
}
namespace OCC {
@ -692,32 +694,30 @@ int ConfigFile::updateSegment() const
QStringList ConfigFile::validUpdateChannels() const
{
auto updateChannelsList = defaultUpdateChannelsList;
if (serverHasValidSubscription() && !Theme::instance()->isBranded()) {
updateChannelsList << defaultEnterpriseChannel;
return enterpriseUpdateChannelsList;
}
return updateChannelsList;
return defaultUpdateChannelsList;
}
QString ConfigFile::defaultUpdateChannel() const
{
auto defaultUpdateChannel = defaultUpdateChannelName;
if (serverHasValidSubscription() && !Theme::instance()->isBranded()) {
if (const auto serverChannel = desktopEnterpriseChannel();
validUpdateChannels().contains(serverChannel)) {
qCWarning(lcConfigFile()) << "Enforcing update channel" << serverChannel << "because that is the desktop enterprise channel returned by the server.";
defaultUpdateChannel = serverChannel;
return serverChannel;
}
}
if (const auto currentVersionSuffix = Theme::instance()->versionSuffix();
validUpdateChannels().contains(currentVersionSuffix)) {
qCWarning(lcConfigFile()) << "Enforcing update channel" << currentVersionSuffix << "because of the version suffix of the current client.";
defaultUpdateChannel = currentVersionSuffix;
return currentVersionSuffix;
}
return defaultUpdateChannel;
return defaultUpdateChannelName;
}
QString ConfigFile::currentUpdateChannel() const
@ -738,7 +738,7 @@ void ConfigFile::setUpdateChannel(const QString &channel)
if (!validUpdateChannels().contains(channel)) {
qCWarning(lcConfigFile()) << "Received invalid update channel:"
<< channel
<< "can only accept 'stable', 'beta' or 'daily'. Ignoring.";
<< "can only accept" << validUpdateChannels() << ". Ignoring.";
return;
}