Skip to content

Commit 988fe5d

Browse files
committed
Merge branch 'auth'
2 parents 03511e6 + b956f0e commit 988fe5d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

FirebaseUI.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Pod::Spec.new do |s|
44
s.summary = 'UI binding libraries for Firebase.'
55
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
66
s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
7-
s.source = { :git => 'https://github.com/firebase/FirebaseUI-iOS.git', :tag => 'v'}
7+
s.source = { :git => 'https://github.com/firebase/FirebaseUI-iOS.git', :tag => 'v' + s.version.to_s}
88
s.author = 'Firebase'
99
s.platform = :ios
1010
s.ios.deployment_target = '9.0'
@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
3333

3434
s.subspec 'Storage' do |storage|
3535
storage.ios.deployment_target = '8.0'
36-
storage.tvos.deployment_target = '11.0'
36+
# storage.tvos.deployment_target = '11.0' Disabled; one of the dependencies doesn't support tvOS.
3737
storage.public_header_files = 'Storage/FirebaseStorageUI/*.h'
3838
storage.source_files = 'Storage/FirebaseStorageUI/*.{h,m}'
3939
storage.dependency 'FirebaseStorage', '~> 3.2.0'

Storage/FirebaseStorageUI/FUIStorageImageLoader.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ - (instancetype)init {
4040
#pragma mark - SDImageLoader Protocol
4141

4242
- (BOOL)canRequestImageForURL:(NSURL *)url {
43-
return url.sd_storageReference;
43+
return url.sd_storageReference != nil;
4444
}
4545

4646
- (id<SDWebImageOperation>)requestImageWithURL:(NSURL *)url options:(SDWebImageOptions)options context:(SDWebImageContext *)context progress:(SDImageLoaderProgressBlock)progressBlock completed:(SDImageLoaderCompletedBlock)completedBlock {
@@ -85,7 +85,9 @@ - (BOOL)canRequestImageForURL:(NSURL *)url {
8585
[download observeStatus:FIRStorageTaskStatusProgress handler:^(FIRStorageTaskSnapshot * _Nonnull snapshot) {
8686
NSProgress *progress = snapshot.progress;
8787
if (progressBlock) {
88-
progressBlock(progress.completedUnitCount, progress.totalUnitCount, url);
88+
progressBlock((NSInteger)progress.completedUnitCount,
89+
(NSInteger)progress.totalUnitCount,
90+
url);
8991
}
9092
}];
9193

0 commit comments

Comments
 (0)