From 96bcbbdc14f892586b4520265b53d114b9381a08 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 21 Mar 2019 14:08:44 -0400 Subject: [PATCH] (fix) consider DAVx5 like Apple Calendar (fixes #4304) --- NEWS | 1 + SoObjects/SOGo/WORequest+SOGo.m | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index d517e6bb62..bd0ddc144c 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,7 @@ Bug fixes - [core] handle multidays events in freebusy data - [core] avoid exception on recent GNUstep when attached file has no filename (#4702) - [core] avoid generating broken DTSTART for the freebusy.ifb file (#4289) + - [core] consider DAVx5 like Apple Calendar (#4304) 4.0.7 (2019-02-27) ------------------ diff --git a/SoObjects/SOGo/WORequest+SOGo.m b/SoObjects/SOGo/WORequest+SOGo.m index 171861b6b6..02e0687f6e 100644 --- a/SoObjects/SOGo/WORequest+SOGo.m +++ b/SoObjects/SOGo/WORequest+SOGo.m @@ -130,10 +130,15 @@ - (BOOL) isIPhone // - (BOOL) isICal { + WEClientCapabilities *cc; + + cc = [self clientCapabilities]; + return ([self isAppleDAVWithSubstring: @"Mac OS X/10."] || [self isAppleDAVWithSubstring: @"Mac_OS_X/"] || [self isAppleDAVWithSubstring: @"Mac+OS+X/"] - || [self isAppleDAVWithSubstring: @"CoreDAV/"]); + || [self isAppleDAVWithSubstring: @"CoreDAV/"] + || [[cc userAgent] rangeOfString: @"DAVx5"].location != NSNotFound); } //