Skip to content

Commit 34203ff

Browse files
committed
Upgrade to the official release version SDWebImage 5.0, adapt the API of error codes
1 parent 3ab34cb commit 34203ff

File tree

3 files changed

+32
-19
lines changed

3 files changed

+32
-19
lines changed

FirebaseUI.podspec

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

Storage/FirebaseStorageUI/SDWebImageFIRStorageLoader.m

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
//
1616

1717
#import "SDWebImageFIRStorageLoader.h"
18+
#import <FirebaseCore/FirebaseCore.h>
1819

1920
@implementation SDWebImageFIRStorageLoader
2021

@@ -37,11 +38,11 @@ - (instancetype)init {
3738

3839
#pragma mark - SDImageLoader Protocol
3940

40-
- (BOOL)canLoadWithURL:(NSURL *)url {
41+
- (BOOL)canRequestImageForURL:(NSURL *)url {
4142
return url.sd_storageReference;
4243
}
4344

44-
- (id<SDWebImageOperation>)loadImageWithURL:(NSURL *)url options:(SDWebImageOptions)options context:(SDWebImageContext *)context progress:(SDImageLoaderProgressBlock)progressBlock completed:(SDImageLoaderCompletedBlock)completedBlock {
45+
- (id<SDWebImageOperation>)requestImageWithURL:(NSURL *)url options:(SDWebImageOptions)options context:(SDWebImageContext *)context progress:(SDImageLoaderProgressBlock)progressBlock completed:(SDImageLoaderCompletedBlock)completedBlock {
4546
FIRStorageReference *storageRef = url.sd_storageReference;
4647
if (!storageRef) {
4748
if (completedBlock) {
@@ -92,4 +93,15 @@ - (BOOL)canLoadWithURL:(NSURL *)url {
9293
return download;
9394
}
9495

96+
- (BOOL)shouldBlockFailedURLWithURL:(NSURL *)url error:(NSError *)error {
97+
if ([error.domain isEqualToString:FIRStorageErrorDomain]) {
98+
if (error.code == FIRStorageErrorCodeBucketNotFound
99+
|| error.code == FIRStorageErrorCodeProjectNotFound
100+
|| error.code == FIRStorageErrorCodeObjectNotFound) {
101+
return YES;
102+
}
103+
}
104+
return NO;
105+
}
106+
95107
@end

Storage/Podfile.lock

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
PODS:
2-
- Firebase/CoreOnly (5.18.0):
3-
- FirebaseCore (= 5.3.1)
4-
- Firebase/Storage (5.18.0):
2+
- Firebase/CoreOnly (5.20.1):
3+
- FirebaseCore (= 5.4.1)
4+
- Firebase/Storage (5.20.1):
55
- Firebase/CoreOnly
6-
- FirebaseStorage (= 3.1.0)
6+
- FirebaseStorage (= 3.1.1)
77
- FirebaseAuthInterop (1.0.0)
8-
- FirebaseCore (5.3.1):
8+
- FirebaseCore (5.4.1):
9+
- GoogleUtilities/Environment (~> 5.2)
910
- GoogleUtilities/Logger (~> 5.2)
10-
- FirebaseStorage (3.1.0):
11+
- FirebaseStorage (3.1.1):
1112
- FirebaseAuthInterop (~> 1.0)
1213
- FirebaseCore (~> 5.2)
1314
- GTMSessionFetcher/Core (~> 1.1)
14-
- GoogleUtilities/Environment (5.4.0)
15-
- GoogleUtilities/Logger (5.4.0):
15+
- GoogleUtilities/Environment (5.5.0)
16+
- GoogleUtilities/Logger (5.5.0):
1617
- GoogleUtilities/Environment
1718
- GTMSessionFetcher/Core (1.2.1)
1819
- OCMock (3.4.3)
19-
- SDWebImage (5.0.0-beta6):
20-
- SDWebImage/Core (= 5.0.0-beta6)
21-
- SDWebImage/Core (5.0.0-beta6)
20+
- SDWebImage (5.0.0):
21+
- SDWebImage/Core (= 5.0.0)
22+
- SDWebImage/Core (5.0.0)
2223

2324
DEPENDENCIES:
2425
- Firebase/Storage
@@ -37,14 +38,14 @@ SPEC REPOS:
3738
- SDWebImage
3839

3940
SPEC CHECKSUMS:
40-
Firebase: 02f3281965c075426141a0ce1277e9de6649cab9
41+
Firebase: 2f5235e62f141cb86181c3af0dfe4509706351ac
4142
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
42-
FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3
43-
FirebaseStorage: 29075f874c2b3cf61e5221a62c4ceefc809e5412
44-
GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560
43+
FirebaseCore: f1a9a8be1aee4bf71a2fc0f4096df6788bdfda61
44+
FirebaseStorage: 6162ef4322502b818d9de0ec552f5226d283de43
45+
GoogleUtilities: 6481e6318c5fcabaaa8513ef8120f329055d7c10
4546
GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
4647
OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab
47-
SDWebImage: 2840a50a41156efccf460df67218b32029177897
48+
SDWebImage: 5de80a0302de9e377e62f47d2fa1304efff0e55f
4849

4950
PODFILE CHECKSUM: ab1bf06e946282a4f1439f4514aeec58dcde8c0f
5051

0 commit comments

Comments
 (0)