From c257314c6e0932cca71c31a1c52bb74bfd976df8 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Thu, 11 Jan 2018 20:55:18 +0100 Subject: [PATCH 1/2] #13671 Fixing an issue where if the images are coming from iCloud, no filename comes with them and the application crashes --- Libraries/CameraRoll/RCTCameraRollManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Libraries/CameraRoll/RCTCameraRollManager.m b/Libraries/CameraRoll/RCTCameraRollManager.m index 4b6a78bde2c21b..142d9bca56dc03 100644 --- a/Libraries/CameraRoll/RCTCameraRollManager.m +++ b/Libraries/CameraRoll/RCTCameraRollManager.m @@ -199,7 +199,7 @@ static void RCTResolvePromise(RCTPromiseResolveBlock resolve, @"group_name": [group valueForProperty:ALAssetsGroupPropertyName], @"image": @{ @"uri": uri, - @"filename" : filename, + @"filename" : filename ? filename : @"", @"height": @(dimensions.height), @"width": @(dimensions.width), @"isStored": @YES, From 62049789ba0403db7420d2bff50551a61d2c3824 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Thu, 11 Jan 2018 22:28:55 +0100 Subject: [PATCH 2/2] changing according to @ide suggestion --- Libraries/CameraRoll/RCTCameraRollManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Libraries/CameraRoll/RCTCameraRollManager.m b/Libraries/CameraRoll/RCTCameraRollManager.m index 142d9bca56dc03..72e128d6ecad33 100644 --- a/Libraries/CameraRoll/RCTCameraRollManager.m +++ b/Libraries/CameraRoll/RCTCameraRollManager.m @@ -199,7 +199,7 @@ static void RCTResolvePromise(RCTPromiseResolveBlock resolve, @"group_name": [group valueForProperty:ALAssetsGroupPropertyName], @"image": @{ @"uri": uri, - @"filename" : filename ? filename : @"", + @"filename" : filename ?: [NSNull null], @"height": @(dimensions.height), @"width": @(dimensions.width), @"isStored": @YES,