Skip to content

Commit fca12f6

Browse files
committed
Add new update channels.
Signed-off-by: Camila Ayres <[email protected]>
1 parent e1b96c2 commit fca12f6

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

src/gui/generalsettings.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,10 @@ void GeneralSettings::slotUpdateChannelChanged()
355355
decodedTranslatedChannel = tr("stable");
356356
} else if (channel == QStringLiteral("beta")) {
357357
decodedTranslatedChannel = tr("beta");
358+
} else if (channel == QStringLiteral("daily")) {
359+
decodedTranslatedChannel = tr("daily");
360+
} else if (channel == QStringLiteral("enterprise")) {
361+
decodedTranslatedChannel = tr("enterprise");
358362
}
359363

360364
return decodedTranslatedChannel;

src/libsync/configfile.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ static constexpr char forceLoginV2C[] = "forceLoginV2";
110110
static constexpr char certPath[] = "http_certificatePath";
111111
static constexpr char certPasswd[] = "http_certificatePasswd";
112112

113-
static const QSet validUpdateChannels { QStringLiteral("stable"), QStringLiteral("beta") };
113+
static const QStringList validUpdateChannels { QStringLiteral("stable"),
114+
QStringLiteral("beta"),
115+
QStringLiteral("daily"),
116+
QStringLiteral("enterprise") };
114117
}
115118

116119
namespace OCC {
@@ -688,7 +691,7 @@ int ConfigFile::updateSegment() const
688691

689692
QString ConfigFile::updateChannel() const
690693
{
691-
QString defaultUpdateChannel = QStringLiteral("stable");
694+
QString defaultUpdateChannel = QStringLiteral("enterprise");
692695
QString suffix = QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
693696
if (suffix.startsWith("daily")
694697
|| suffix.startsWith("nightly")
@@ -711,6 +714,11 @@ QString ConfigFile::updateChannel() const
711714
return channel;
712715
}
713716

717+
QStringList ConfigFile::validUpdateChannel() const
718+
{
719+
return validUpdateChannels;
720+
}
721+
714722
void ConfigFile::setUpdateChannel(const QString &channel)
715723
{
716724
if (!validUpdateChannels.contains(channel)) {

src/libsync/configfile.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
196196
[[nodiscard]] int updateSegment() const;
197197

198198
[[nodiscard]] QString updateChannel() const;
199+
[[nodiscard]] QStringList validUpdateChannel() const;
199200
void setUpdateChannel(const QString &channel);
200201

201202
[[nodiscard]] QString overrideServerUrl() const;

0 commit comments

Comments
 (0)