Skip to content

Commit 8d22b61

Browse files
committed
Add versionSuffix function to Theme.
Signed-off-by: Camila Ayres <[email protected]>
1 parent 1e68dab commit 8d22b61

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

src/gui/updater/updater.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ QUrlQuery Updater::getQueryParams()
9999
query.addQueryItem(QStringLiteral("buildArch"), QSysInfo::buildCpuArchitecture());
100100
query.addQueryItem(QStringLiteral("currentArch"), QSysInfo::currentCpuArchitecture());
101101

102-
const auto suffix = QStringLiteral(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
102+
const auto suffix = Theme::instance()->versionSuffix();
103103
query.addQueryItem(QStringLiteral("versionsuffix"), suffix);
104104

105105
ConfigFile config;

src/libsync/configfile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ int ConfigFile::updateSegment() const
686686

687687
QString ConfigFile::updateChannel() const
688688
{
689-
auto defaultUpdateChannel = QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
689+
auto defaultUpdateChannel = Theme::instance()->versionSuffix();
690690
QSettings settings(configFile(), QSettings::IniFormat);
691691
const auto channel = settings.value(QLatin1String(updateChannelC), defaultUpdateChannel).toString();
692692
if (!validUpdateChannels().contains(channel)) {

src/libsync/theme.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,11 @@ QString Theme::version() const
195195
return MIRALL_VERSION_STRING;
196196
}
197197

198+
QString Theme::versionSuffix() const
199+
{
200+
return QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
201+
}
202+
198203
QString Theme::configFileName() const
199204
{
200205
return QStringLiteral(APPLICATION_CONFIG_NAME ".cfg");

src/libsync/theme.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ class OWNCLOUDSYNC_EXPORT Theme : public QObject
196196

197197
[[nodiscard]] QString statusHeaderText(SyncResult::Status) const;
198198
[[nodiscard]] QString version() const;
199+
[[nodiscard]] QString versionSuffix() const;
199200

200201
/**
201202
* Characteristics: bool if more than one sync folder is allowed

0 commit comments

Comments
 (0)