Fix RCTLinkingManager crash on iOS7

javache · Facebook Github Bot 9 · commit c8835d02263f · 2016-02-26T06:50:34.000-08:00
Reviewed By: nicklockwood

Differential Revision: D2982199

fb-gh-sync-id: 28ff6ddfe850df5925424423115ba953651ca94f
shipit-source-id: 28ff6ddfe850df5925424423115ba953651ca94f
diff --git a/Libraries/LinkingIOS/RCTLinkingManager.m b/Libraries/LinkingIOS/RCTLinkingManager.m
@@ -34,17 +34,18 @@ - (void)setBridge:(RCTBridge *)bridge
 - (NSDictionary<NSString *, id> *)constantsToExport
 {
   NSURL *initialURL;
-  
+
   if (_bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) {
     initialURL = _bridge.launchOptions[UIApplicationLaunchOptionsURLKey];
-  } else if (_bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey]) {
+  } else if (&UIApplicationLaunchOptionsUserActivityDictionaryKey &&
+      _bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey]) {
     NSDictionary *userActivityDictionary = _bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey];
 
     if ([userActivityDictionary[UIApplicationLaunchOptionsUserActivityTypeKey] isEqual:NSUserActivityTypeBrowsingWeb]) {
       initialURL = ((NSUserActivity *)userActivityDictionary[@"UIApplicationLaunchOptionsUserActivityKey"]).webpageURL;
     }
   }
-  
+
   return @{@"initialURL": RCTNullIfNil(initialURL.absoluteString)};
 }
 

Original file line number	Diff line number	Diff line change
`@@ -34,17 +34,18 @@ - (void)setBridge:(RCTBridge *)bridge`
`34`	`34`	`- (NSDictionary<NSString , id> )constantsToExport`
`35`	`35`	`{`
`36`	`36`	`NSURL *initialURL;`
`37`		`-`
	`37`	`+`
`38`	`38`	`if (_bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) {`
`39`	`39`	`initialURL = _bridge.launchOptions[UIApplicationLaunchOptionsURLKey];`
`40`		`- } else if (_bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey]) {`
	`40`	`+ } else if (&UIApplicationLaunchOptionsUserActivityDictionaryKey &&`
	`41`	`+ _bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey]) {`
`41`	`42`	`NSDictionary *userActivityDictionary = _bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey];`
`42`	`43`
`43`	`44`	`if ([userActivityDictionary[UIApplicationLaunchOptionsUserActivityTypeKey] isEqual:NSUserActivityTypeBrowsingWeb]) {`
`44`	`45`	`initialURL = ((NSUserActivity *)userActivityDictionary[@"UIApplicationLaunchOptionsUserActivityKey"]).webpageURL;`
`45`	`46`	`}`
`46`	`47`	`}`
`47`		`-`
	`48`	`+`
`48`	`49`	`return @{@"initialURL": RCTNullIfNil(initialURL.absoluteString)};`
`49`	`50`	`}`
`50`	`51`