-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add a method for setting preconfigured PINRemoteImageManager #1124
Merged
nguyenhuy
merged 10 commits into
TextureGroup:master
from
ernestmama:injectedRemoteImageManager
Sep 18, 2018
Merged
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
e3ca0dc
add a method for setting preconfigured PINRemoteImageManager instead …
ernestmama f189a83
update preconfigured image manager where it can only be set once
ernestmama 9919bdb
fix spacing in downloader
ernestmama 8430060
Fix doc/comments on new api
ernestmama b23daf6
adding assertion to ensure either only configuration or preconfigure …
ernestmama 683ca29
adding assertion to ensure either only configuration or preconfigure …
ernestmama 31a6fbb
adding assertion to ensure either only configuration or preconfigure …
ernestmama a2bdf7b
fix assertion condition
ernestmama 2dbef33
Update CHANGELOG.md
nguyenhuy e19bb45
Remove unnecessary change
nguyenhuy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -119,15 +119,24 @@ + (ASPINRemoteImageDownloader *)sharedDownloader NS_RETURNS_RETAINED | |
+ (void)setSharedImageManagerWithConfiguration:(nullable NSURLSessionConfiguration *)configuration | ||
{ | ||
NSAssert(sharedDownloader == nil, @"Singleton has been created and session can no longer be configured."); | ||
__unused PINRemoteImageManager *sharedManager = [self sharedPINRemoteImageManagerWithConfiguration:configuration]; | ||
__unused PINRemoteImageManager *sharedManager = [self sharedPINRemoteImageManagerWithConfiguration:configuration preconfiguredPINRemoteImageManager:nil]; | ||
} | ||
|
||
+ (PINRemoteImageManager *)sharedPINRemoteImageManagerWithConfiguration:(NSURLSessionConfiguration *)configuration | ||
+ (void)setSharedPreconfiguredImageManager:(nullable PINRemoteImageManager *)preconfiguredPINRemoteImageManager | ||
{ | ||
static ASPINRemoteImageManager *sharedPINRemoteImageManager; | ||
NSAssert(sharedDownloader == nil, @"Singleton has been created and session can no longer be configured."); | ||
__unused PINRemoteImageManager *sharedManager = [self sharedPINRemoteImageManagerWithConfiguration:nil preconfiguredPINRemoteImageManager:preconfiguredPINRemoteImageManager]; | ||
} | ||
|
||
+ (PINRemoteImageManager *)sharedPINRemoteImageManagerWithConfiguration:(NSURLSessionConfiguration *)configuration preconfiguredPINRemoteImageManager:(PINRemoteImageManager *)preconfiguredPINRemoteImageManager | ||
{ | ||
static PINRemoteImageManager *sharedPINRemoteImageManager; | ||
static dispatch_once_t onceToken; | ||
dispatch_once(&onceToken, ^{ | ||
|
||
|
||
if (preconfiguredPINRemoteImageManager) { | ||
sharedPINRemoteImageManager = preconfiguredPINRemoteImageManager; | ||
} else { | ||
#if PIN_ANIMATED_AVAILABLE | ||
// Check that Carthage users have linked both PINRemoteImage & PINCache by testing for one file each | ||
if (!(NSClassFromString(@"PINRemoteImageManager"))) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The indentation seems to be off. The whole else body here should be indented. |
||
|
@@ -149,13 +158,14 @@ + (PINRemoteImageManager *)sharedPINRemoteImageManagerWithConfiguration:(NSURLSe | |
#else | ||
sharedPINRemoteImageManager = [[ASPINRemoteImageManager alloc] initWithSessionConfiguration:configuration]; | ||
#endif | ||
} | ||
}); | ||
return sharedPINRemoteImageManager; | ||
} | ||
|
||
- (PINRemoteImageManager *)sharedPINRemoteImageManager | ||
{ | ||
return [ASPINRemoteImageDownloader sharedPINRemoteImageManagerWithConfiguration:nil]; | ||
return [ASPINRemoteImageDownloader sharedPINRemoteImageManagerWithConfiguration:nil preconfiguredPINRemoteImageManager:nil]; | ||
} | ||
|
||
- (BOOL)sharedImageManagerSupportsMemoryRemoval | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it? How about:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are rrright.