Merge pull request #27488 from msrn/win10cal-useragent

Add regex to match Windows 10 calendar user-agent
nextcloud · Jun 29, 2021 · d1b0ccb · d1b0ccb
2 parents fbc9377 + 14c33bb
commit d1b0ccb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php b/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php
@@ -40,9 +40,12 @@ class Plugin extends ServerPlugin {
 	 * list of regular expressions for calendar user agents,
 	 * that do not support subscriptions on their own
 	 *
+	 * /^MSFT-WIN-3/ - Windows 10 Calendar
 	 * @var string[]
 	 */
-	public const ENABLE_FOR_CLIENTS = [];
+	public const ENABLE_FOR_CLIENTS = [
+		"/^MSFT-WIN-3/"
+	];
 
 	/**
 	 * @var bool

diff --git a/apps/dav/tests/unit/CalDAV/WebcalCaching/PluginTest.php b/apps/dav/tests/unit/CalDAV/WebcalCaching/PluginTest.php
@@ -31,7 +31,7 @@ public function testDisabled() {
 		$request = $this->createMock(IRequest::class);
 		$request->expects($this->at(0))
 			->method('isUserAgent')
-			->with([])
+			->with(Plugin::ENABLE_FOR_CLIENTS)
 			->willReturn(false);
 
 		$request->expects($this->at(1))
@@ -48,7 +48,7 @@ public function testEnabled() {
 		$request = $this->createMock(IRequest::class);
 		$request->expects($this->at(0))
 			->method('isUserAgent')
-			->with([])
+			->with(Plugin::ENABLE_FOR_CLIENTS)
 			->willReturn(false);
 
 		$request->expects($this->at(1))