Skip to content

Commit 7df56b8

Browse files
dreampiggydreampiggy
committed
Update the FirebaseUIStorage to use SDWebImage 5.6.0's API, which use a specify loader instead of dummy manager
1 parent 460d1f7 commit 7df56b8

3 files changed

Lines changed: 25 additions & 38 deletions

File tree

‎FirebaseUI.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
3737
storage.public_header_files = 'Storage/FirebaseStorageUI/*.h'
3838
storage.source_files = 'Storage/FirebaseStorageUI/*.{h,m}'
3939
storage.dependency 'Firebase/Storage', '~> 6.0'
40-
storage.dependency 'SDWebImage', '~> 5.0'
40+
storage.dependency 'SDWebImage', '~> 5.6'
4141
storage.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(PODS_ROOT)/FirebaseUI/FirebaseStorageUI' }
4242
end
4343

‎Storage/FirebaseStorageUI/UIImageView+FirebaseStorage.m‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@
1717
#import "UIImageView+FirebaseStorage.h"
1818
#import "FUIStorageImageLoader.h"
1919

20-
static SDWebImageManager *DefaultWebImageManager(void) {
21-
static dispatch_once_t onceToken;
22-
static SDWebImageManager *manager;
23-
dispatch_once(&onceToken, ^{
24-
manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:FUIStorageImageLoader.sharedLoader];
25-
});
26-
return manager;
27-
}
28-
2920
@implementation UIImageView (FirebaseStorage)
3021

3122
- (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef {
@@ -121,12 +112,8 @@ - (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
121112
} else {
122113
mutableContext = [NSMutableDictionary dictionary];
123114
}
124-
if (!mutableContext[SDWebImageContextCustomManager]) {
125-
mutableContext[SDWebImageContextCustomManager] = DefaultWebImageManager();
126-
}
127-
if (!mutableContext[SDWebImageContextFUIStorageMaxImageSize]) {
128-
mutableContext[SDWebImageContextFUIStorageMaxImageSize] = @(size);
129-
}
115+
mutableContext[SDWebImageContextImageLoader] = FUIStorageImageLoader.sharedLoader;
116+
mutableContext[SDWebImageContextFUIStorageMaxImageSize] = @(size);
130117

131118
[self sd_setImageWithURL:url placeholderImage:placeholder options:options context:[mutableContext copy] progress:^(NSInteger receivedSize, NSInteger expectedSize, NSURL * _Nullable targetURL) {
132119
if (progressBlock) {

‎Storage/Podfile.lock‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
PODS:
2-
- Firebase/CoreOnly (6.15.0):
3-
- FirebaseCore (= 6.6.0)
4-
- Firebase/Storage (6.15.0):
2+
- Firebase/CoreOnly (6.18.0):
3+
- FirebaseCore (= 6.6.3)
4+
- Firebase/Storage (6.18.0):
55
- Firebase/CoreOnly
66
- FirebaseStorage (~> 3.5.0)
77
- FirebaseAuthInterop (1.0.0)
8-
- FirebaseCore (6.6.0):
8+
- FirebaseCore (6.6.3):
99
- FirebaseCoreDiagnostics (~> 1.2)
1010
- FirebaseCoreDiagnosticsInterop (~> 1.2)
1111
- GoogleUtilities/Environment (~> 6.5)
1212
- GoogleUtilities/Logger (~> 6.5)
13-
- FirebaseCoreDiagnostics (1.2.0):
13+
- FirebaseCoreDiagnostics (1.2.1):
1414
- FirebaseCoreDiagnosticsInterop (~> 1.2)
1515
- GoogleDataTransportCCTSupport (~> 1.3)
1616
- GoogleUtilities/Environment (~> 6.5)
@@ -21,23 +21,23 @@ PODS:
2121
- FirebaseAuthInterop (~> 1.0)
2222
- FirebaseCore (~> 6.0)
2323
- GTMSessionFetcher/Core (~> 1.1)
24-
- GoogleDataTransport (3.3.0)
25-
- GoogleDataTransportCCTSupport (1.3.0):
26-
- GoogleDataTransport (~> 3.3)
24+
- GoogleDataTransport (4.0.1)
25+
- GoogleDataTransportCCTSupport (1.4.1):
26+
- GoogleDataTransport (~> 4.0)
2727
- nanopb (~> 0.3.901)
28-
- GoogleUtilities/Environment (6.5.0)
29-
- GoogleUtilities/Logger (6.5.0):
28+
- GoogleUtilities/Environment (6.5.1)
29+
- GoogleUtilities/Logger (6.5.1):
3030
- GoogleUtilities/Environment
3131
- GTMSessionFetcher/Core (1.3.1)
3232
- nanopb (0.3.9011):
3333
- nanopb/decode (= 0.3.9011)
3434
- nanopb/encode (= 0.3.9011)
3535
- nanopb/decode (0.3.9011)
3636
- nanopb/encode (0.3.9011)
37-
- OCMock (3.5)
38-
- SDWebImage (5.5.1):
39-
- SDWebImage/Core (= 5.5.1)
40-
- SDWebImage/Core (5.5.1)
37+
- OCMock (3.6)
38+
- SDWebImage (5.6.0):
39+
- SDWebImage/Core (= 5.6.0)
40+
- SDWebImage/Core (5.6.0)
4141

4242
DEPENDENCIES:
4343
- Firebase/Storage
@@ -61,19 +61,19 @@ SPEC REPOS:
6161
- SDWebImage
6262

6363
SPEC CHECKSUMS:
64-
Firebase: 5d77105d9740a07ca6b16927ca971db7e860faaf
64+
Firebase: 0490eca762a72e4f1582319539153897f1508dee
6565
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
66-
FirebaseCore: 4aeb81ff53dcd9a3634ca725dc1fb8c2a4622046
67-
FirebaseCoreDiagnostics: 5e78803ab276bc5b50340e3c539c06c3de35c649
66+
FirebaseCore: 78276943ad85e616dfa54dafa6c89512987d9d60
67+
FirebaseCoreDiagnostics: 2109d10c35e8289b1ee6cabf44d9ffb055620194
6868
FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
6969
FirebaseStorage: 6c5263796af3b1be82ed173598aade47535fe125
70-
GoogleDataTransport: 574a983e829327d7c18f2627f65d9e80164ea8a4
71-
GoogleDataTransportCCTSupport: cad3cd6cdbdbad6b5c2c9206ec413402755faaaa
72-
GoogleUtilities: f8de7ddf8c706f58e9b405d53e38bbdaa2731e5a
70+
GoogleDataTransport: 653963cf5be60fb59cf051e070f0836fdc305f81
71+
GoogleDataTransportCCTSupport: 84e4d4bbab642f2e9d83ee65d78aca2b5527d314
72+
GoogleUtilities: 06eb53bb579efe7099152735900dd04bf09e7275
7373
GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925
7474
nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
75-
OCMock: 4ab4577fc941af31f4a0398f6e7e230cf21fc72a
76-
SDWebImage: 1245d058b7b8f59adef7a6da6bbafd4f1ab67041
75+
OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
76+
SDWebImage: 21b19f56b4226cdfe3aefe4e6848dc43ed129a86
7777

7878
PODFILE CHECKSUM: 4ee09a538f9ded78a1ee0184c63b1157301e92e4
7979

0 commit comments

Comments
 (0)