mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the minimum supported version

Browse Source 
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
This commit is contained in:
Olivier Goffart 2018-06-29 09:43:53 +02:00 committed by Olivier Goffart
parent 918f6abd98
commit aefeb08e36
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/accountsettings.cpp
View File

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

2
src/gui/owncloudgui.cpp
View File

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

3
src/libsync/account.cpp
View File

@ -463,7 +463,8 @@ bool Account::serverVersionUnsupported() const
// not detected yet, assume it is fine.
return false;
}
return serverVersionInt() < makeServerVersion(9, 1, 0);
// Older version which is not "end of life" according to https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule
return serverVersionInt() < makeServerVersion(10, 0, 0) || serverVersion().endsWith("Nextcloud");
}
void Account::setServerVersion(const QString &version)

2
src/libsync/networkjobs.cpp
View File

@ -423,7 +423,7 @@ void CheckServerJob::onTimedOut()
QString CheckServerJob::version(const QJsonObject &info)
{
return info.value(QLatin1String("version")).toString();
return info.value(QLatin1String("version")).toString() + "-" + info.value(QLatin1String("productname")).toString();
}
QString CheckServerJob::versionString(const QJsonObject &info)