From 348daee36622ad84260198f818d68e46a608560b Mon Sep 17 00:00:00 2001 From: mustafa Date: Wed, 13 Mar 2013 13:54:18 -0500 Subject: [PATCH] adding en namespace to category methods to avoid collisions with other categories --- README.md | 3 ++- SampleApp/MoreViewController.m | 4 ++-- SampleApp/iPadViewController.m | 2 +- SampleApp/iPhoneViewController.m | 2 +- evernote-sdk-ios/Utilities/ENMLUtility.m | 6 +++--- evernote-sdk-ios/Utilities/NSData+EvernoteSDK.h | 6 +++--- evernote-sdk-ios/Utilities/NSData+EvernoteSDK.m | 6 +++--- evernote-sdk-ios/Utilities/NSDataBase64Additions.h | 6 +++--- evernote-sdk-ios/Utilities/NSDataBase64Additions.m | 8 ++++---- evernote-sdk-ios/Utilities/NSDate+EDAMAdditions.h | 4 ++-- evernote-sdk-ios/Utilities/NSDate+EDAMAdditions.m | 4 ++-- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 39b5726..e56d5be 100755 --- a/README.md +++ b/README.md @@ -23,7 +23,8 @@ You have a few options: - Copy the evernote-sdk-ios source code into your Xcode project. - Add the evernote-sdk-ios xcodeproj to your project/workspace. -- Build the evernote-sdk-ios as a static library and include the .h's and .a. (Make sure to add the `-ObjC` flag to your compiler flags if you choose this option.) +- Build the evernote-sdk-ios as a static library and include the .h's and .a. (Make sure to add the `-ObjC` flag to your "Other Linker flags" if you choose this option). +More info [here](http://developer.apple.com/library/ios/#technotes/iOSStaticLibraries/Articles/configuration.html#/apple_ref/doc/uid/TP40012554-CH3-SW2). - Use [cocoapods](http://cocoapods.org), a nice Objective-C dependency manager. Our pod name is "Evernote-SDK-iOS". ### Link with frameworks diff --git a/SampleApp/MoreViewController.m b/SampleApp/MoreViewController.m index c929308..c257049 100644 --- a/SampleApp/MoreViewController.m +++ b/SampleApp/MoreViewController.m @@ -44,7 +44,7 @@ - (IBAction)saveNewNote:(id)sender { if([[EvernoteSession sharedSession] isEvernoteInstalled]) { NSString* filePath = [[NSBundle mainBundle] pathForResource:@"evernote_logo_4c-sm" ofType:@"png"]; NSData *myFileData = [NSData dataWithContentsOfFile:filePath]; - NSData *dataHash = [myFileData md5]; + NSData *dataHash = [myFileData enmd5]; EDAMData *edamData = [[EDAMData alloc] initWithBodyHash:dataHash size:myFileData.length body:myFileData]; EDAMResource* resource = [[EDAMResource alloc] initWithGuid:nil noteGuid:nil data:edamData mime:@"image/png" width:0 height:0 duration:0 active:0 recognition:0 attributes:nil updateSequenceNum:0 alternateData:nil]; NSMutableArray *resources = [NSMutableArray arrayWithObjects:resource,resource, nil]; @@ -100,7 +100,7 @@ - (IBAction)createBusinessNote:(id)sender { EDAMLinkedNotebook* businessNotebook = linkedNotebooks[0]; NSString* filePath = [[NSBundle mainBundle] pathForResource:@"evernote_logo_4c-sm" ofType:@"png"]; NSData *myFileData = [NSData dataWithContentsOfFile:filePath]; - NSData *dataHash = [myFileData md5]; + NSData *dataHash = [myFileData enmd5]; EDAMData *edamData = [[EDAMData alloc] initWithBodyHash:dataHash size:myFileData.length body:myFileData]; EDAMResource* resource = [[EDAMResource alloc] initWithGuid:nil noteGuid:nil data:edamData mime:@"image/png" width:0 height:0 duration:0 active:0 recognition:0 attributes:nil updateSequenceNum:0 alternateData:nil]; NSString *noteContent = [NSString stringWithFormat:@"" diff --git a/SampleApp/iPadViewController.m b/SampleApp/iPadViewController.m index 7328882..608a287 100644 --- a/SampleApp/iPadViewController.m +++ b/SampleApp/iPadViewController.m @@ -130,7 +130,7 @@ - (IBAction)listBusinessNotebooks:(id)sender { - (IBAction)createPhotoNote:(id)sender { NSString* filePath = [[NSBundle mainBundle] pathForResource:@"evernote_logo_4c-sm" ofType:@"png"]; NSData *myFileData = [NSData dataWithContentsOfFile:filePath]; - NSData *dataHash = [myFileData md5]; + NSData *dataHash = [myFileData enmd5]; EDAMData *edamData = [[EDAMData alloc] initWithBodyHash:dataHash size:myFileData.length body:myFileData]; EDAMResource* resource = [[EDAMResource alloc] initWithGuid:nil noteGuid:nil data:edamData mime:@"image/png" width:0 height:0 duration:0 active:0 recognition:0 attributes:nil updateSequenceNum:0 alternateData:nil]; NSString *noteContent = [NSString stringWithFormat:@"" diff --git a/SampleApp/iPhoneViewController.m b/SampleApp/iPhoneViewController.m index c1e6104..281a5f9 100755 --- a/SampleApp/iPhoneViewController.m +++ b/SampleApp/iPhoneViewController.m @@ -145,7 +145,7 @@ - (IBAction)listSharedNotes:(id)sender { - (IBAction)createPhotoNote:(id)sender { NSString* filePath = [[NSBundle mainBundle] pathForResource:@"evernote_logo_4c-sm" ofType:@"png"]; NSData *myFileData = [NSData dataWithContentsOfFile:filePath]; - NSData *dataHash = [myFileData md5]; + NSData *dataHash = [myFileData enmd5]; EDAMData *edamData = [[EDAMData alloc] initWithBodyHash:dataHash size:myFileData.length body:myFileData]; EDAMResource* resource = [[EDAMResource alloc] initWithGuid:nil noteGuid:nil data:edamData mime:@"image/png" width:0 height:0 duration:0 active:0 recognition:0 attributes:nil updateSequenceNum:0 alternateData:nil]; NSString *noteContent = [NSString stringWithFormat:@"" diff --git a/evernote-sdk-ios/Utilities/ENMLUtility.m b/evernote-sdk-ios/Utilities/ENMLUtility.m index 684b3b8..1cedb19 100644 --- a/evernote-sdk-ios/Utilities/ENMLUtility.m +++ b/evernote-sdk-ios/Utilities/ENMLUtility.m @@ -56,7 +56,7 @@ + (NSString*) mediaTagWithDataHash:(NSData *)dataHash if (mime == nil) { mime = ENMIMETypeOctetStream; } - NSString* dataHashHex = [dataHash lowercaseHexDigits]; + NSString* dataHashHex = [dataHash enlowercaseHexDigits]; NSString* mediaTag = [NSString stringWithFormat:@"<%@ type =\"%@\" hash=\"%@\"/>", ENMLTagMedia, mime, @@ -107,7 +107,7 @@ - (void) parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName na } else if([elementName isEqualToString:ENMLTagMedia] && self.resources) { NSString *mediaHash = [attributeDict objectForKey:@"hash"]; - NSData* dataHash = [NSData dataWithHexDigits:mediaHash]; + NSData* dataHash = [NSData endataWithHexDigits:mediaHash]; EDAMResource *foundResource = nil; for (EDAMResource* resource in self.resources) { if([[[resource data] bodyHash] isEqualToData:dataHash]) { @@ -177,7 +177,7 @@ - (void) writeImageTagForResource:(EDAMResource *)resource NSMutableDictionary *imageAttributes = [NSMutableDictionary dictionaryWithDictionary:attributes]; NSString *mime = [resource mime]; - NSString* imgStr = [NSString stringWithFormat:@"data:%@;base64,%@",mime,[[[resource data] body] base64Encoding]]; + NSString* imgStr = [NSString stringWithFormat:@"data:%@;base64,%@",mime,[[[resource data] body] enbase64Encoding]]; [imageAttributes setObject:imgStr forKey:@"src"]; diff --git a/evernote-sdk-ios/Utilities/NSData+EvernoteSDK.h b/evernote-sdk-ios/Utilities/NSData+EvernoteSDK.h index fc34eac..c163a26 100644 --- a/evernote-sdk-ios/Utilities/NSData+EvernoteSDK.h +++ b/evernote-sdk-ios/Utilities/NSData+EvernoteSDK.h @@ -37,14 +37,14 @@ @returns The MD5 hash */ -- (NSData *) md5; +- (NSData *) enmd5; /** hex representation of data (used in ENML media) @returns The hex representation in lower case */ -- (NSString *) lowercaseHexDigits; +- (NSString *) enlowercaseHexDigits; -+ (NSData *) dataWithHexDigits: (NSString *) hexDigits; ++ (NSData *) endataWithHexDigits: (NSString *) hexDigits; @end diff --git a/evernote-sdk-ios/Utilities/NSData+EvernoteSDK.m b/evernote-sdk-ios/Utilities/NSData+EvernoteSDK.m index 66c6c3e..3e984a5 100644 --- a/evernote-sdk-ios/Utilities/NSData+EvernoteSDK.m +++ b/evernote-sdk-ios/Utilities/NSData+EvernoteSDK.m @@ -32,7 +32,7 @@ @implementation NSData (EvernoteSDK) -- (NSData *) md5 +- (NSData *) enmd5 { unsigned char md5Buffer[CC_MD5_DIGEST_LENGTH]; CC_MD5(self.bytes, (CC_LONG)self.length, md5Buffer); @@ -40,7 +40,7 @@ - (NSData *) md5 return md5Data; } -- (NSString *) lowercaseHexDigits +- (NSString *) enlowercaseHexDigits { unsigned const char * bytes = [self bytes]; @@ -54,7 +54,7 @@ - (NSString *) lowercaseHexDigits return hex; } -+ (NSData *) dataWithHexDigits: (NSString *) hexDigits ++ (NSData *) endataWithHexDigits: (NSString *) hexDigits { if (!hexDigits) { return nil; diff --git a/evernote-sdk-ios/Utilities/NSDataBase64Additions.h b/evernote-sdk-ios/Utilities/NSDataBase64Additions.h index 7abf384..cf0d16e 100644 --- a/evernote-sdk-ios/Utilities/NSDataBase64Additions.h +++ b/evernote-sdk-ios/Utilities/NSDataBase64Additions.h @@ -4,9 +4,9 @@ // Original development by Dave Winer. @interface NSData (NSDataBase64Additions) -+ (NSData *) dataWithBase64EncodedString:(NSString *) string; ++ (NSData *) endataWithBase64EncodedString:(NSString *) string; - (id) initWithBase64EncodedString:(NSString *) string; -- (NSString *) base64Encoding; -- (NSString *) base64EncodingWithLineLength:(unsigned int) lineLength; +- (NSString *) enbase64Encoding; +- (NSString *) enbase64EncodingWithLineLength:(unsigned int) lineLength; @end diff --git a/evernote-sdk-ios/Utilities/NSDataBase64Additions.m b/evernote-sdk-ios/Utilities/NSDataBase64Additions.m index 3a5c51b..9794552 100644 --- a/evernote-sdk-ios/Utilities/NSDataBase64Additions.m +++ b/evernote-sdk-ios/Utilities/NSDataBase64Additions.m @@ -12,7 +12,7 @@ 'w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/' }; @implementation NSData (NSDataBase64Additions) -+ (NSData *) dataWithBase64EncodedString:(NSString *) string { ++ (NSData *) endataWithBase64EncodedString:(NSString *) string { return [[NSData allocWithZone:nil] initWithBase64EncodedString:string]; } @@ -84,11 +84,11 @@ - (id) initWithBase64EncodedString:(NSString *) string { #pragma mark - -- (NSString *) base64Encoding { - return [self base64EncodingWithLineLength:0]; +- (NSString *) enbase64Encoding { + return [self enbase64EncodingWithLineLength:0]; } -- (NSString *) base64EncodingWithLineLength:(unsigned int) lineLength { +- (NSString *) enbase64EncodingWithLineLength:(unsigned int) lineLength { const unsigned char *bytes = [self bytes]; NSMutableData * resultData = [NSMutableData dataWithCapacity: [self length]*1.5]; unsigned long ixtext = 0; diff --git a/evernote-sdk-ios/Utilities/NSDate+EDAMAdditions.h b/evernote-sdk-ios/Utilities/NSDate+EDAMAdditions.h index 2fede37..49ef03c 100644 --- a/evernote-sdk-ios/Utilities/NSDate+EDAMAdditions.h +++ b/evernote-sdk-ios/Utilities/NSDate+EDAMAdditions.h @@ -38,12 +38,12 @@ @param edamTimestamp The timestamp obtained from an Evernote API data structure. @return The equivalent NSDate */ -+ (NSDate *) dateFromEDAMTimestamp: (int64_t) edamTimestamp; ++ (NSDate *) endateFromEDAMTimestamp: (int64_t) edamTimestamp; /** * Convert an NSDate to an edam timestamp */ -- (int64_t) edamTimestamp; +- (int64_t) enedamTimestamp; @end diff --git a/evernote-sdk-ios/Utilities/NSDate+EDAMAdditions.m b/evernote-sdk-ios/Utilities/NSDate+EDAMAdditions.m index 9f2afe0..537c40e 100644 --- a/evernote-sdk-ios/Utilities/NSDate+EDAMAdditions.m +++ b/evernote-sdk-ios/Utilities/NSDate+EDAMAdditions.m @@ -31,12 +31,12 @@ @implementation NSDate (EDAMAdditions) -+ (NSDate *) dateFromEDAMTimestamp: (int64_t) edamTimestamp ++ (NSDate *) endateFromEDAMTimestamp: (int64_t) edamTimestamp { return [NSDate dateWithTimeIntervalSince1970: ((double)edamTimestamp)/1000.0]; } -- (int64_t) edamTimestamp +- (int64_t) enedamTimestamp { return trunc([self timeIntervalSince1970]) * 1000; }