From dab313a0de65ff3c28558a0222882d3fc474eaff Mon Sep 17 00:00:00 2001 From: Oleg Lokhvitsky Date: Mon, 11 Dec 2017 10:37:14 -0800 Subject: [PATCH] Revert D6437807: [react-native][PR] Generalize ActionSheetManager items URL Differential Revision: D6437807 fbshipit-source-id: 2d859c7e4d88950ec070813ec40f08685a5d6b44 --- .../ActionSheetIOS/RCTActionSheetManager.m | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.m b/Libraries/ActionSheetIOS/RCTActionSheetManager.m index 708be80e0e0..9f550f77af3 100644 --- a/Libraries/ActionSheetIOS/RCTActionSheetManager.m +++ b/Libraries/ActionSheetIOS/RCTActionSheetManager.m @@ -133,17 +133,11 @@ RCT_EXPORT_METHOD(showShareActionSheetWithOptions:(NSDictionary *)options if (message) { [items addObject:message]; } - NSArray *URLS = [RCTConvert NSURLArray:options[@"url"]]; - - if (URLS.count == 0) { - RCTLogError(@"No `url` or `message` to share"); - return; - } - - for (NSURL *url in URLS) { - if ([url.scheme.lowercaseString isEqualToString:@"data"]) { + NSURL *URL = [RCTConvert NSURL:options[@"url"]]; + if (URL) { + if ([URL.scheme.lowercaseString isEqualToString:@"data"]) { NSError *error; - NSData *data = [NSData dataWithContentsOfURL:url + NSData *data = [NSData dataWithContentsOfURL:URL options:(NSDataReadingOptions)0 error:&error]; if (!data) { @@ -152,9 +146,13 @@ RCT_EXPORT_METHOD(showShareActionSheetWithOptions:(NSDictionary *)options } [items addObject:data]; } else { - [items addObject:url]; + [items addObject:URL]; } } + if (items.count == 0) { + RCTLogError(@"No `url` or `message` to share"); + return; + } UIActivityViewController *shareController = [[UIActivityViewController alloc] initWithActivityItems:items applicationActivities:nil];