From 15f8dc572a31abc9b494f9e3bb943bf55879c6c3 Mon Sep 17 00:00:00 2001 From: rmalik Date: Wed, 23 Nov 2016 14:26:39 -0800 Subject: [PATCH] - Fix assignment of alternativeRepresentationProvider to be the singleton instance of ASPINRemoteImageDownloader. - Revert "Revert "Expose internal singleton method as a class method vs instance method."" - Fix API bug in ASCollectionNode+Beta --- .../Details/ASPINRemoteImageDownloader.m | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m b/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m index 956ff138bf..832fe0d5f4 100644 --- a/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m +++ b/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m @@ -103,15 +103,10 @@ static ASPINRemoteImageDownloader *sharedDownloader = nil; + (void)setSharedImageManagerWithConfiguration:(nullable NSURLSessionConfiguration *)configuration { NSAssert(sharedDownloader == nil, @"Singleton has been created and session can no longer be configured."); - __unused PINRemoteImageManager *sharedManager = [[self class] sharedPINRemoteImageManagerWithConfiguration:configuration]; + __unused PINRemoteImageManager *sharedManager = [self sharedPINRemoteImageManagerWithConfiguration:configuration]; } -- (PINRemoteImageManager *)sharedPINRemoteImageManager -{ - return [self sharedPINRemoteImageManagerWithConfiguration:nil]; -} - -- (PINRemoteImageManager *)sharedPINRemoteImageManagerWithConfiguration:(NSURLSessionConfiguration *)configuration ++ (PINRemoteImageManager *)sharedPINRemoteImageManagerWithConfiguration:(NSURLSessionConfiguration *)configuration { static ASPINRemoteImageManager *sharedPINRemoteImageManager; static dispatch_once_t onceToken; @@ -133,7 +128,8 @@ static ASPINRemoteImageDownloader *sharedDownloader = nil; userInfo:nil]; @throw e; } - sharedPINRemoteImageManager = [[ASPINRemoteImageManager alloc] initWithSessionConfiguration:configuration alternativeRepresentationProvider:self]; + sharedPINRemoteImageManager = [[ASPINRemoteImageManager alloc] initWithSessionConfiguration:configuration + alternativeRepresentationProvider:[self sharedDownloader]]; #else sharedPINRemoteImageManager = [[ASPINRemoteImageManager alloc] initWithSessionConfiguration:configuration]; #endif @@ -141,6 +137,11 @@ static ASPINRemoteImageDownloader *sharedDownloader = nil; return sharedPINRemoteImageManager; } +- (PINRemoteImageManager *)sharedPINRemoteImageManager +{ + return [ASPINRemoteImageDownloader sharedPINRemoteImageManagerWithConfiguration:nil]; +} + - (BOOL)sharedImageManagerSupportsMemoryRemoval { static BOOL sharedImageManagerSupportsMemoryRemoval = NO;