* SoObjects/SOGo/WORequest+SOGo.[mh]

(-isAndroid): new method to detect whether the
  request has been performed from an android client

  * SoObjects/Contacts/SOGoContactFolders.m (appendSystemSources):
  Let sogo append system sources if the request comes from an android
  client even if its user agent matches the IPhoneAddressBook

Monotone-Parent: a4ef73c2ad79c8da8d8e0c93767ab06e14bc846b
Monotone-Revision: 228f7d730cde5a5046b0885c1ac02649ee2b7c05

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-29T20:17:20
This commit is contained in:
Jean Raby committed 2012-06-29 20:17:20 +00:00
1 parent 38b1cbd014
commit 0a2244c2cb
4 files changed
+26 -2

No files matched your search

+4 -2
View File
@@ -127,7 +127,8 @@
SOGoContactSourceFolder *currentFolder;
SOGoUser *currentUser;
if (![[context request] isIPhoneAddressBookApp])
if (! ([[context request] isIPhoneAddressBookApp] &&
![[context request] isAndroid]))
{
currentUser = [context activeUser];
if (activeUserIsOwner
@@ -271,7 +272,8 @@
NSArray *sourceIDs;
NSString *domain, *srcDisplayName;
if ([[context request] isIPhoneAddressBookApp])
if ([[context request] isIPhoneAddressBookApp] &&
![[context request] isAndroid])
{
currentUser = [context activeUser];
if (activeUserIsOwner