From 4a19a8d64429b3dca492b6d8d8f01dd2edd059e7 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 1 Mar 2018 09:15:17 +0100 Subject: [PATCH] ConnectionValidator: change the minimum server version Forbit connection with server older than 7.0. These server did not have permission. Also warn for anything older than 9.1. 9.0 is end of life according to https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule --- src/gui/connectionvalidator.cpp | 6 +++--- src/libsync/account.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp index 52b81888ea..3f702903d2 100644 --- a/src/gui/connectionvalidator.cpp +++ b/src/gui/connectionvalidator.cpp @@ -275,15 +275,15 @@ bool ConnectionValidator::setAndCheckServerVersion(const QString &version) qCInfo(lcConnectionValidator) << _account->url() << "has server version" << version; _account->setServerVersion(version); - // We cannot deal with servers < 5.0.0 + // We cannot deal with servers < 7.0.0 if (_account->serverVersionInt() - && _account->serverVersionInt() < Account::makeServerVersion(5, 0, 0)) { + && _account->serverVersionInt() < Account::makeServerVersion(7, 0, 0)) { _errors.append(tr("The configured server for this client is too old")); _errors.append(tr("Please update to the latest server and restart the client.")); reportResult(ServerVersionMismatch); return false; } - // We attempt to work with servers >= 5.0.0 but warn users. + // We attempt to work with servers >= 7.0.0 but warn users. // Check usages of Account::serverVersionUnsupported() for details. #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index 7907ea530d..3e9d39aa6c 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -463,7 +463,7 @@ bool Account::serverVersionUnsupported() const // not detected yet, assume it is fine. return false; } - return serverVersionInt() < makeServerVersion(7, 0, 0); + return serverVersionInt() < makeServerVersion(9, 1, 0); } void Account::setServerVersion(const QString &version)