From d96a4ba94de5171a53150ee55e277abdd9c5b968 Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Wed, 10 Feb 2016 09:25:30 -0800 Subject: [PATCH] Minor fixes to clipboard and Linking to remove TODOs Reviewed By: nicklockwood Differential Revision: D2921782 fb-gh-sync-id: e387b720421ed6ed03a50633d71e08791f87c761 shipit-source-id: e387b720421ed6ed03a50633d71e08791f87c761 --- Libraries/LinkingIOS/RCTLinkingManager.m | 6 ++---- React/Modules/RCTClipboard.m | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Libraries/LinkingIOS/RCTLinkingManager.m b/Libraries/LinkingIOS/RCTLinkingManager.m index b8bc364bd..1a3042217 100644 --- a/Libraries/LinkingIOS/RCTLinkingManager.m +++ b/Libraries/LinkingIOS/RCTLinkingManager.m @@ -77,10 +77,8 @@ RCT_EXPORT_METHOD(openURL:(NSURL *)URL resolve:(RCTPromiseResolveBlock)resolve reject:(__unused RCTPromiseRejectBlock)reject) { - // TODO: we should really report success/failure via the promise here - // Doesn't really matter what thread we call this on since it exits the app - [RCTSharedApplication() openURL:URL]; - resolve(@YES); + BOOL opened = [RCTSharedApplication() openURL:URL]; + resolve(@(opened)); } RCT_EXPORT_METHOD(canOpenURL:(NSURL *)URL diff --git a/React/Modules/RCTClipboard.m b/React/Modules/RCTClipboard.m index cad23d58b..8d059c4a3 100644 --- a/React/Modules/RCTClipboard.m +++ b/React/Modules/RCTClipboard.m @@ -26,14 +26,14 @@ RCT_EXPORT_MODULE() RCT_EXPORT_METHOD(setString:(NSString *)content) { UIPasteboard *clipboard = [UIPasteboard generalPasteboard]; - clipboard.string = content; + clipboard.string = (content ? : @""); } RCT_EXPORT_METHOD(getString:(RCTPromiseResolveBlock)resolve rejecter:(__unused RCTPromiseRejectBlock)reject) { UIPasteboard *clipboard = [UIPasteboard generalPasteboard]; - resolve(RCTNullIfNil(clipboard.string)); + resolve((clipboard.string ? : @"")); } @end