From 027cbae7a9359b38661e6a576826f15909dc5286 Mon Sep 17 00:00:00 2001 From: Jonathan Willing Date: Tue, 14 May 2013 00:09:58 -0500 Subject: factor out code to handle case where we've already fetched the iamge --- .../ios/iOS UI Test/iOS UI Test/MCOMessageView.mm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'example/ios') diff --git a/example/ios/iOS UI Test/iOS UI Test/MCOMessageView.mm b/example/ios/iOS UI Test/iOS UI Test/MCOMessageView.mm index 97946a96..5e89f33b 100755 --- a/example/ios/iOS UI Test/iOS UI Test/MCOMessageView.mm +++ b/example/ios/iOS UI Test/iOS UI Test/MCOMessageView.mm @@ -139,16 +139,23 @@ NSString * partUniqueID = [part uniqueID]; NSData * data = [[self delegate] MCOMessageView:self dataForPartWithUniqueID:partUniqueID]; + + void (^replaceImages)(NSError *error) = ^(NSError *error) { + NSData * downloadedData = [[self delegate] MCOMessageView:self dataForPartWithUniqueID:partUniqueID]; + NSData * previewData = [[self delegate] MCOMessageView:self previewForData:downloadedData isHTMLInlineImage:[self _isCID:url]]; + NSString *filename = [NSString stringWithFormat:@"%lu", (unsigned long)urlString.hash]; + NSURL *cacheURL = [self _cacheJPEGImageData:previewData withFilename:filename]; + + NSString *replaceScript = [NSString stringWithFormat:@"replaceImageSrc(\"%@\", \"%@\")", urlString, cacheURL.absoluteString]; + [_webView stringByEvaluatingJavaScriptFromString:replaceScript]; + }; + if (data == NULL) { [[self delegate] MCOMessageView:self fetchDataForPartWithUniqueID:partUniqueID downloadedFinished:^(NSError * error) { - NSData * downloadedData = [[self delegate] MCOMessageView:self dataForPartWithUniqueID:partUniqueID]; - NSData * previewData = [[self delegate] MCOMessageView:self previewForData:downloadedData isHTMLInlineImage:[self _isCID:url]]; - NSString *filename = [NSString stringWithFormat:@"%lu", (unsigned long)urlString.hash]; - NSURL *cacheURL = [self _cacheJPEGImageData:previewData withFilename:filename]; - - NSString *replaceScript = [NSString stringWithFormat:@"replaceImageSrc(\"%@\", \"%@\")", urlString, cacheURL.absoluteString]; - [_webView stringByEvaluatingJavaScriptFromString:replaceScript]; + replaceImages(error); }]; + } else { + replaceImages(nil); } } } -- cgit v1.2.3