(fix) consider DAVx5 like Apple Calendar (fixes #4304)

Alinto · Mar 21, 2019 · 96bcbbd · 96bcbbd
1 parent fcdc4c9
commit 96bcbbd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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);
 }
 
 //