From: Olivier Goffart <ogoffart@woboq.com>
Date: Fri, 29 Jun 2018 07:43:53 +0000 (+0200)
Subject: Update the minimum supported version
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~510
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=afc953b649e6a2dca24084adaa66c9d0af7c1b9e;p=nextcloud-desktop.git

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 4bf282675..99fdb2023 100644
--- 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 c1374ea09..0fd1abf4b 100644
--- 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 b6709e7fa..ee4ee1ffa 100644
--- 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 a32286b41..2e2eacd47 100644
--- 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)