Merge pull request Evernote#85 from igrechuhin/master

remove retain cycles
joaquinmoreira · Feb 10, 2015 · 6af9cfe · 6af9cfe
2 parents c2c8d85 + d185e58
commit 6af9cfe
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 36 deletions.
diff --git a/evernote-sdk-ios.xcodeproj/project.pbxproj b/evernote-sdk-ios.xcodeproj/project.pbxproj
@@ -1653,6 +1653,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "evernote-sdk-ios/evernote-sdk-ios-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GCC_WARN_SHADOW = NO;
 				HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				OTHER_LDFLAGS = "-ObjC";
@@ -1669,6 +1670,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "evernote-sdk-ios/evernote-sdk-ios-Prefix.pch";
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_SHADOW = NO;
 				HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				OTHER_LDFLAGS = "-ObjC";

diff --git a/evernote-sdk-ios/ENSDK/ENNote.m b/evernote-sdk-ios/ENSDK/ENNote.m
@@ -173,6 +173,7 @@ - (void)generateWebArchiveData:(ENNoteGenerateWebArchiveDataCompletionHandler)co
     }
 
     ENMLUtility * utility = [[ENMLUtility alloc] init];
+    NSURL * sourceURL = self.sourceUrl ? [NSURL URLWithString:self.sourceUrl] : nil;
     [utility convertENMLToHTML:enml withReferencedResources:edamResources completionBlock:^(NSString * html, NSError * error) {
         if (!html) {
             ENSDKLogInfo(@"+webArchiveData failed to convert ENML to HTML: %@", error);
@@ -182,7 +183,6 @@ - (void)generateWebArchiveData:(ENNoteGenerateWebArchiveDataCompletionHandler)co
 
         // Create main resource from the HTML.
         NSData * htmlData = [html dataUsingEncoding:NSUTF8StringEncoding];
-        NSURL * sourceURL = self.sourceUrl ? [NSURL URLWithString:self.sourceUrl] : nil;
         ENWebResource * mainResource = [[ENWebResource alloc] initWithData:htmlData
                                                                        URL:sourceURL
                                                                   MIMEType:@"text/html"