kylefang/react-native-firebase
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-firebase.git synced 2026-04-18 12:12:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Salakar
2019-11-25 12:59:48 +00:00
parent ccc1ba4ae9 88a01672a8
commit 44537d4e95
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/admob/RNFBAdMob.podspec
View File

@@ -9,7 +9,7 @@ if using_custom_firebase_sdk_version
end
Pod::Spec.new do |s|
s.name = "RNFBAdmob"
s.name = "RNFBAdMob"
s.version = package["version"]
s.description = package["description"]
s.summary = <<-DESC

14
packages/storage/ios/RNFBStorage/RNFBStorageCommon.m
View File

@@ -182,9 +182,17 @@
NSArray<PHAssetResource *> *resources = [PHAssetResource assetResourcesForAsset:asset];
for (PHAssetResource *resource in resources) {
exportSession.outputFileType = resource.uniformTypeIdentifier;
if (exportSession.outputFileType != nil)
break;
if (resources.count > 1) {
if (resource.type != PHAssetResourceTypeVideo) {
continue;
} else {
exportSession.outputFileType = resource.uniformTypeIdentifier;
}
} else {
exportSession.outputFileType = resource.uniformTypeIdentifier;
}
if (exportSession.outputFileType != nil) break;
}
[exportSession exportAsynchronouslyWithCompletionHandler:^{