Skip to content

Commit aefeb08

Browse files
committed
Update the minimum supported version
We want to warn if the server version is not supported and did not get appropriate QA for this client version. https://github.com/owncloud/enterprise/issues/2687
1 parent 918f6ab commit aefeb08

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

src/gui/accountsettings.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ void AccountSettings::slotAccountStateChanged()
651651
if (state == AccountState::Connected) {
652652
QStringList errors;
653653
if (account->serverVersionUnsupported()) {
654-
errors << tr("The server version %1 is old and unsupported! Proceed at your own risk.").arg(account->serverVersion());
654+
errors << tr("The server version %1 is unsupported! Proceed at your own risk.").arg(account->serverVersion());
655655
}
656656
showConnectionLabel(tr("Connected to %1.").arg(serverWithUser), errors);
657657
} else if (state == AccountState::ServiceUnavailable) {

src/gui/owncloudgui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ void ownCloudGui::slotTrayMessageIfServerUnsupported(Account *account)
196196
if (account->serverVersionUnsupported()) {
197197
slotShowTrayMessage(
198198
tr("Unsupported Server Version"),
199-
tr("The server on account %1 runs an old and unsupported version %2. "
199+
tr("The server on account %1 runs an unsupported version %2. "
200200
"Using this client with unsupported server versions is untested and "
201201
"potentially dangerous. Proceed at your own risk.")
202202
.arg(account->displayName(), account->serverVersion()));

src/libsync/account.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,8 @@ bool Account::serverVersionUnsupported() const
463463
// not detected yet, assume it is fine.
464464
return false;
465465
}
466-
return serverVersionInt() < makeServerVersion(9, 1, 0);
466+
// Older version which is not "end of life" according to https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule
467+
return serverVersionInt() < makeServerVersion(10, 0, 0) || serverVersion().endsWith("Nextcloud");
467468
}
468469

469470
void Account::setServerVersion(const QString &version)

src/libsync/networkjobs.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ void CheckServerJob::onTimedOut()
423423

424424
QString CheckServerJob::version(const QJsonObject &info)
425425
{
426-
return info.value(QLatin1String("version")).toString();
426+
return info.value(QLatin1String("version")).toString() + "-" + info.value(QLatin1String("productname")).toString();
427427
}
428428

429429
QString CheckServerJob::versionString(const QJsonObject &info)

0 commit comments

Comments
 (0)