status-im
/
react-native-firebase
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/invertase/react-native-firebase

This commit is contained in:
Salakar 2017-03-09 16:59:16 +00:00
parent 899dd1a3cb a4e464dbba
commit 199b7ee588
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ios/RNFirebase/RNFirebaseDatabase.m
View File

@ -50,6 +50,7 @@
};
id errorBlock = ^(NSError * _Nonnull error) {
NSLog(@"Error onDBEvent: %@", [error debugDescription]);
[self unsetListeningOn:eventName];
[self getAndSendDatabaseError:error
path:_path
modifiersString:_modifiersString];

21
ios/RNFirebase/RNFirebaseStorage.m
View File

@ -175,26 +175,7 @@ RCT_EXPORT_METHOD(putFile:(NSString *) path
PHAsset *asset = [assets firstObject];
//NOTE: This is all based on http://stackoverflow.com/questions/35241449
if (asset.mediaType == PHAssetMediaTypeImage && (asset.mediaSubtypes & PHAssetMediaSubtypePhotoLive)) {
//TODO: This is untested as I don't have an iPhone 6s/7
PHLivePhotoRequestOptions *options = [PHLivePhotoRequestOptions new];
options.networkAccessAllowed = YES;
[[PHImageManager defaultManager] requestLivePhotoForAsset:asset
targetSize:CGSizeZero
contentMode:PHImageContentModeAspectFill
options:options
resultHandler:^(PHLivePhoto * _Nullable livePhoto, NSDictionary * _Nullable info) {
if ([info objectForKey:PHImageErrorKey] == nil) {
NSData *livePhotoData = [NSKeyedArchiver archivedDataWithRootObject:livePhoto];
[self uploadData:livePhotoData metadata:metadata path:path callback:callback];
} else {
NSDictionary *errProps = [[NSMutableDictionary alloc] init];
[errProps setValue:@"Could not obtain live image data" forKey:@"message"];
//TODO: Error event
callback(@[errProps]);
}
}];
} else if (asset.mediaType == PHAssetMediaTypeImage) {
if (asset.mediaType == PHAssetMediaTypeImage) {
PHImageRequestOptions *options = [PHImageRequestOptions new];
options.networkAccessAllowed = true;
[[PHImageManager defaultManager] requestImageDataForAsset:asset