Monotone-Parent: 57e11c311296e70140960bcd3420fad8473f5342

Monotone-Revision: 1f459bf5c352f45ee6179088dda845fed84878af

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-20T12:49:16
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,10 @@
 2010-08-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/WORequest+SOGo.m (-isMacOSXAddressBookApp):
+	renamed from "isAddressBookApp".
+	(-isIPhoneAddressBookApp): new method to detect whether the
+	request has been performed from the AB of iOS.
+
 	* SoObjects/SOGo/SOGoFolder.m (-davEntityTag): we no return a
 	pseudo etag for collections for compatibility with the broken
 	Apple clients.

SoObjects/SOGo/WORequest+SOGo.h

@@ -34,7 +34,8 @@
 - (BOOL) isIPhone;
 - (BOOL) isICal;
 - (BOOL) isICal4;
-- (BOOL) isAddressBookApp;
+- (BOOL) isMacOSXAddressBookApp;
+- (BOOL) isIPhoneAddressBookApp;
 
 @end
 

SoObjects/SOGo/WORequest+SOGo.m

@@ -104,6 +104,7 @@
   return patchedProperties;
 }
 
+/* So many different DAV libraries... */
 - (BOOL) isAppleDAVWithSubstring: (NSString *) osSubstring
 {
   WEClientCapabilities *cc;
@@ -137,7 +138,7 @@
   return [self isAppleDAVWithSubstring: @"iCal/4."];
 }
 
-- (BOOL) isAddressBookApp
+- (BOOL) isMacOSXAddressBookApp
 {
   WEClientCapabilities *cc;
 
@@ -147,4 +148,14 @@
           && [[cc userAgent] rangeOfString: @"Darwin"].location != NSNotFound);
 }
 
+- (BOOL) isIPhoneAddressBookApp
+{
+  WEClientCapabilities *cc;
+
+  cc = [self clientCapabilities];
+
+  return ([[cc userAgent] rangeOfString: @"DataAccess/1.0"].location
+          != NSNotFound);
+}
+
 @end