Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/gui/connectionvalidator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/

#include <QJsonDocument>

Check failure on line 7 in src/gui/connectionvalidator.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/connectionvalidator.cpp:7:10 [clang-diagnostic-error]

'QJsonDocument' file not found
#include <QJsonObject>
#include <QJsonArray>
#include <QLoggingCategory>
Expand Down Expand Up @@ -291,16 +291,16 @@
qCInfo(lcConnectionValidator) << _account->url() << "has server version" << version;
_account->setServerVersion(version);

// We cannot deal with servers < 7.0.0
if (_account->serverVersionInt()
&& _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 >= 7.0.0 but warn users.
// The check is not required anymore as we need to be able to connect to different servers from different suppliers
// Do not remove it as it might be useful later if e.g. a branding parameter could be relevant
// Check usages of Account::serverVersionUnsupported() for details.
// if (_account->serverVersionInt()
// && _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;
// }

// Record that the server supports HTTP/2
// Actual decision if we should use HTTP/2 is done in AccessManager::createRequest
Expand Down
Loading