Skip to content

Commit

Permalink
Merge branch 'auth'
Browse files Browse the repository at this point in the history
  • Loading branch information
morganchen12 committed May 30, 2019
2 parents 03511e6 + b956f0e commit 988fe5d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions FirebaseUI.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Pod::Spec.new do |s|
s.summary = 'UI binding libraries for Firebase.'
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
s.source = { :git => 'https://github.com/firebase/FirebaseUI-iOS.git', :tag => 'v'}
s.source = { :git => 'https://github.com/firebase/FirebaseUI-iOS.git', :tag => 'v' + s.version.to_s}
s.author = 'Firebase'
s.platform = :ios
s.ios.deployment_target = '9.0'
Expand Down Expand Up @@ -33,7 +33,7 @@ Pod::Spec.new do |s|

s.subspec 'Storage' do |storage|
storage.ios.deployment_target = '8.0'
storage.tvos.deployment_target = '11.0'
# storage.tvos.deployment_target = '11.0' Disabled; one of the dependencies doesn't support tvOS.
storage.public_header_files = 'Storage/FirebaseStorageUI/*.h'
storage.source_files = 'Storage/FirebaseStorageUI/*.{h,m}'
storage.dependency 'FirebaseStorage', '~> 3.2.0'
Expand Down
6 changes: 4 additions & 2 deletions Storage/FirebaseStorageUI/FUIStorageImageLoader.m
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ - (instancetype)init {
#pragma mark - SDImageLoader Protocol

- (BOOL)canRequestImageForURL:(NSURL *)url {
return url.sd_storageReference;
return url.sd_storageReference != nil;
}

- (id<SDWebImageOperation>)requestImageWithURL:(NSURL *)url options:(SDWebImageOptions)options context:(SDWebImageContext *)context progress:(SDImageLoaderProgressBlock)progressBlock completed:(SDImageLoaderCompletedBlock)completedBlock {
Expand Down Expand Up @@ -85,7 +85,9 @@ - (BOOL)canRequestImageForURL:(NSURL *)url {
[download observeStatus:FIRStorageTaskStatusProgress handler:^(FIRStorageTaskSnapshot * _Nonnull snapshot) {
NSProgress *progress = snapshot.progress;
if (progressBlock) {
progressBlock(progress.completedUnitCount, progress.totalUnitCount, url);
progressBlock((NSInteger)progress.completedUnitCount,
(NSInteger)progress.totalUnitCount,
url);
}
}];

Expand Down

0 comments on commit 988fe5d

Please sign in to comment.