From 35d71f61505309078b3199850fd8ba3f5d176c68 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 19 Mar 2014 11:30:18 -0400 Subject: [PATCH] Added deviceType capabilities to the code --- ActiveSync/NSString+ActiveSync.h | 1 + ActiveSync/NSString+ActiveSync.m | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/ActiveSync/NSString+ActiveSync.h b/ActiveSync/NSString+ActiveSync.h index 6f0433de0..f3f95b07b 100644 --- a/ActiveSync/NSString+ActiveSync.h +++ b/ActiveSync/NSString+ActiveSync.h @@ -46,6 +46,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - (NSString *) realCollectionIdWithFolderType: (SOGoMicrosoftActiveSyncFolderType *) folderType; - (NSCalendarDate *) calendarDate; - (NSString *) deviceId; +- (NSString *) deviceType; - (NSString *) command; - (NSData *) convertHexStringToBytes; diff --git a/ActiveSync/NSString+ActiveSync.m b/ActiveSync/NSString+ActiveSync.m index 8b09c75ad..1c7a8ba5b 100644 --- a/ActiveSync/NSString+ActiveSync.m +++ b/ActiveSync/NSString+ActiveSync.m @@ -169,6 +169,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. return s; } +// +// This method extracts the "DeviceType" from a URI: +// +// /SOGo/Microsoft-Server-ActiveSync?Cmd=FolderSync&User=sogo10&DeviceId=SEC17CD1A3E9E3F2&DeviceType=SAMSUNGSGHI317M +// +- (NSString *) deviceType +{ + NSString *s; + + s = [self _valueForParameter: @"DEVICETYPE="]; + + if (!s) + s = @"Unknown"; + + return s; +} + // // //