From 44af47f69e6dbaecd23adf250de8d149be9abb6a Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 10 Jun 2015 20:09:40 -0400 Subject: [PATCH] (fix) avoid method clash from categories that would lead to unexpected behaviors --- ActiveSync/NSString+ActiveSync.m | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ActiveSync/NSString+ActiveSync.m b/ActiveSync/NSString+ActiveSync.m index 7060d569c..884083db8 100644 --- a/ActiveSync/NSString+ActiveSync.m +++ b/ActiveSync/NSString+ActiveSync.m @@ -53,7 +53,10 @@ static NSArray *easCommandParameters = nil; // e.g. SMILING FACE WITH OPEN MOUTH // ok: wchar_t -> 😃 wrong: unichar -> � � // -- (NSString *)stringByEscapingXMLStringUsingCharacters { +// We avoir naming it like the one in SOPE since if the ActiveSync +// bundle is loaded, it'll overwrite the one provided by SOPE. +// +- (NSString *) _stringByEscapingXMLStringUsingCharacters { register unsigned i, len, j; register wchar_t *buf; const wchar_t *chars; @@ -153,7 +156,7 @@ static NSArray *easCommandParameters = nil; - (NSString *) activeSyncRepresentationInContext: (WOContext *) context { - return [self stringByEscapingXMLStringUsingCharacters]; + return [self _stringByEscapingXMLStringUsingCharacters]; } - (int) activeSyncFolderType