|
17 | 17 | #import "UIImageView+FirebaseStorage.h"
|
18 | 18 | #import "SDWebImageFirebaseLoader.h"
|
19 | 19 |
|
20 |
| -static SDWebImageManager *SharedFirebaseWebImageManager(void) { |
| 20 | +static SDWebImageManager *DefaultFirebaseWebImageManager(void) { |
21 | 21 | static dispatch_once_t onceToken;
|
22 | 22 | static SDWebImageManager *manager;
|
23 | 23 | dispatch_once(&onceToken, ^{
|
24 |
| - manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:SDWebImageFirebaseLoader.sharedLoader]; |
| 24 | + manager = [[SDWebImageManager alloc] initWithCache:SDWebImageManager.defaultImageCache loader:SDWebImageFirebaseLoader.sharedLoader]; |
25 | 25 | });
|
26 | 26 | return manager;
|
27 | 27 | }
|
@@ -121,14 +121,12 @@ - (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
|
121 | 121 | } else {
|
122 | 122 | mutableContext = [NSMutableDictionary dictionary];
|
123 | 123 | }
|
124 |
| - mutableContext[SDWebImageContextCustomManager] = SharedFirebaseWebImageManager(); |
125 |
| - mutableContext[SDWebImageContextFirebaseMaxImageSize] = @(size); |
126 |
| - |
127 |
| - // TODO: Current version use `fullpath` as cache key, but not the URL. Do we need to keep compabitle ? |
128 |
| - SDWebImageCacheKeyFilter *cacheKeyFilter = [SDWebImageCacheKeyFilter cacheKeyFilterWithBlock:^NSString * _Nullable(NSURL * _Nonnull url) { |
129 |
| - return url.sd_storageReference.fullPath; |
130 |
| - }]; |
131 |
| - mutableContext[SDWebImageContextCacheKeyFilter] = cacheKeyFilter; |
| 124 | + if (!mutableContext[SDWebImageContextCustomManager]) { |
| 125 | + mutableContext[SDWebImageContextCustomManager] = DefaultFirebaseWebImageManager(); |
| 126 | + } |
| 127 | + if (!mutableContext[SDWebImageContextFirebaseMaxImageSize]) { |
| 128 | + mutableContext[SDWebImageContextFirebaseMaxImageSize] = @(size); |
| 129 | + } |
132 | 130 |
|
133 | 131 | [self sd_setImageWithURL:url placeholderImage:placeholder options:options context:[mutableContext copy] progress:^(NSInteger receivedSize, NSInteger expectedSize, NSURL * _Nullable targetURL) {
|
134 | 132 | if (progressBlock) {
|
|
0 commit comments