From bd80eed5852e71654bbe729b35ac7465dd58152a Mon Sep 17 00:00:00 2001
From: Matthew Setter <matthew@matthewsetter.com>
Date: Fri, 26 May 2017 11:58:45 +0200
Subject: [PATCH] Update the minimum desktop version to 2.2.4

This commit sets the minimum ownCloud client version to
2.2.4. This fixes #27978.
---
 .../Sabre/BlockLegacyClientPlugin.php          |  2 +-
 .../Sabre/BlockLegacyClientPluginTest.php      | 18 +++++++++---------
 config/config.sample.php                       |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php
index 3019ade0cc81..c95cfcea46f7 100644
--- a/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php
@@ -67,7 +67,7 @@ public function beforeHandler(RequestInterface $request) {
 			return;
 		}
 
-		$minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.0.0');
+		$minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.2.4');
 
 		// Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
 		// "mirall/%1" for older releases
diff --git a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
index a35dd0458568..a7c617b70c55 100644
--- a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
@@ -77,8 +77,8 @@ public function testBeforeHandlerException($userAgent) {
 		$this->config
 			->expects($this->once())
 			->method('getSystemValue')
-			->with('minimum.supported.desktop.version', '2.0.0')
-			->will($this->returnValue('1.7.0'));
+			->with('minimum.supported.desktop.version', '2.2.4')
+			->will($this->returnValue('2.2.4'));
 
 		$this->blockLegacyClientVersionPlugin->beforeHandler($request);
 	}
@@ -88,11 +88,11 @@ public function testBeforeHandlerException($userAgent) {
 	 */
 	public function newAndAlternateDesktopClientProvider() {
 		return [
-			['Mozilla/5.0 (1.7.0) mirall/1.7.0'],
-			['mirall/1.8.3'],
-			['mirall/1.7.2'],
-			['mirall/1.7.0'],
-			['Mozilla/5.0 (Bogus Text) mirall/1.9.3'],
+			['Mozilla/5.0 (2.2.4) mirall/2.2.4'],
+			['mirall/2.8.3'],
+			['mirall/2.7.2'],
+			['mirall/2.7.0'],
+			['Mozilla/5.0 (Bogus Text) mirall/3.0.1'],
 		];
 	}
 
@@ -112,8 +112,8 @@ public function testBeforeHandlerSuccess($userAgent) {
 		$this->config
 			->expects($this->once())
 			->method('getSystemValue')
-			->with('minimum.supported.desktop.version', '2.0.0')
-			->will($this->returnValue('1.7.0'));
+			->with('minimum.supported.desktop.version', '2.2.4')
+			->will($this->returnValue('2.2.4'));
 
 		$this->blockLegacyClientVersionPlugin->beforeHandler($request);
 	}
diff --git a/config/config.sample.php b/config/config.sample.php
index 00f307e46d4b..206c09aa97aa 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1253,7 +1253,7 @@
  * client may not function as expected, and could lead to permanent data loss for
  * clients or other unexpected results.
  */
-'minimum.supported.desktop.version' => '2.0.0',
+'minimum.supported.desktop.version' => '2.2.4',
 
 /**
  * EXPERIMENTAL: option whether to include external storage in quota