From b319de5d1613d7187bd191e712e8572b6f3e56ca Mon Sep 17 00:00:00 2001 From: "Pan, Xinlei (Ryan)" Date: Wed, 11 Apr 2018 12:31:23 -0400 Subject: [PATCH] remove cachedResponseForRequest method --- MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m | 24 ++++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m b/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m index 6cde35a..c54398e 100644 --- a/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m +++ b/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m @@ -535,22 +535,16 @@ static NSString * const STATIC_CACHE_COMPONENT = @"StaticCache.txt"; NSURLSession *session = [NSURLSession sessionWithConfiguration:configure]; NSURLRequest *request = [NSURLRequest requestWithURL:s7URL cachePolicy:NSURLRequestUseProtocolCachePolicy timeoutInterval:1800]; NSCachedURLResponse *response = [sharedCache cachedResponseForRequest:request]; - if (response != nil) { - UIImage *image = [UIImage imageWithData:response.data scale:[UIScreen mainScreen].scale]; + NSURLSessionDownloadTask *downloadImageTask = [session downloadTaskWithRequest:request completionHandler:^(NSURL * _Nullable location, NSURLResponse * _Nullable response, NSError * _Nullable error) { + NSData *data = [NSData dataWithContentsOfURL:location]; + NSCachedURLResponse *cachedreponse = [[NSCachedURLResponse alloc] initWithResponse:response data:data]; + [sharedCache storeCachedResponse:cachedreponse forRequest:request]; + NSLog(@"HEADDERRRSS %i for %@ %@", ((NSHTTPURLResponse *)response).statusCode,s7URL.absoluteString,((NSHTTPURLResponse *)response).allHeaderFields.description); + UIImage *image = [UIImage imageWithData:data scale:[UIScreen mainScreen].scale]; completionHandler(image, nil, isFallBackImage); - return; - } else { - NSURLSessionDownloadTask *downloadImageTask = [session downloadTaskWithRequest:request completionHandler:^(NSURL * _Nullable location, NSURLResponse * _Nullable response, NSError * _Nullable error) { - NSData *data = [NSData dataWithContentsOfURL:location]; - NSCachedURLResponse *cachedreponse = [[NSCachedURLResponse alloc] initWithResponse:response data:data]; - [sharedCache storeCachedResponse:cachedreponse forRequest:request]; - NSLog(@"HEADDERRRSS %i for %@ %@", ((NSHTTPURLResponse *)response).statusCode,s7URL.absoluteString,((NSHTTPURLResponse *)response).allHeaderFields.description); - UIImage *image = [UIImage imageWithData:data scale:[UIScreen mainScreen].scale]; - completionHandler(image, nil, isFallBackImage); - }]; - [downloadImageTask resume]; - return; - } + }]; + [downloadImageTask resume]; + return; /* // Check in memory cache img = [self getCachedImageWithName:s7URL.absoluteString];