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

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 4bf282675382733b729825b0b1ca02733f365bcc..99fdb2023d48f6b859979ab4ff8ceb0e14e442d1 100644 (file)
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -773,7 +773,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) {

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index c1374ea09d2963196a81fe43db2e27176ec75660..0fd1abf4baa8b1ac623b2782531b93cfc050fe25 100644 (file)
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -228,7 +228,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()));

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index b6709e7fa26ff679c62a56a921dc5a247990e187..ee4ee1ffaf058a6b027e13198a8a03acd1fa88b5 100644 (file)
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -498,7 +498,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://docs.nextcloud.com/server/latest/admin_manual/release_schedule.html
+    return serverVersionInt() < makeServerVersion(18, 0, 0) || !serverVersion().endsWith("Nextcloud");
 }
 
 void Account::setServerVersion(const QString &version)

diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
index a32286b411b5fbf17ed8e505ed719bad1e3bb0af..2e2eacd473eecdb67a7a6a73b9ff660d98e83acf 100644 (file)
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -436,7 +436,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)