Skip to content

Commit 5cc919c

Browse files
committed
Merge branch 'UUID'
2 parents da1a210 + fd073e3 commit 5cc919c

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

Pod/Classes/PINRemoteImageManager.m

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ - (NSUUID *)downloadImageWithURL:(NSURL *)url
348348
processor:(PINRemoteImageManagerImageProcessor)processor
349349
progress:(PINRemoteImageManagerImageCompletion)progress
350350
completion:(PINRemoteImageManagerImageCompletion)completion
351-
inputUUID:(NSUUID *)inputUUID
351+
inputUUID:(NSUUID *)UUID
352352
{
353353
NSAssert((processor != nil && processorKey.length > 0) || (processor == nil && processorKey == nil), @"processor must not be nil and processorKey length must be greater than zero OR processor must be nil and processorKey must be nil");
354354

@@ -370,14 +370,11 @@ - (NSUUID *)downloadImageWithURL:(NSURL *)url
370370
if ([url isKindOfClass:[NSString class]]) {
371371
url = [NSURL URLWithString:(NSString *)url];
372372
}
373-
374-
NSUUID *UUID;
375-
if (inputUUID) {
376-
UUID = inputUUID;
377-
} else {
373+
374+
if (UUID == nil) {
378375
UUID = [NSUUID UUID];
379376
}
380-
377+
381378
NSString *key = [self cacheKeyForURL:url processorKey:processorKey];
382379
//Check to see if the image is in memory cache and we're on the main thread.
383380
//If so, special case this to avoid flashing the UI

0 commit comments

Comments
 (0)