Skip to content

Commit 836a8e0

Browse files
iljadaderkograbbou
authored andcommitted
Fix universal links not working in iOS 12 / Xcode 10 (#22764)
Summary: fix #22716 Changelog: ---------- [iOS][Fixed] - Fix universal links in iOS 12 / Xcode 10 Pull Request resolved: #22764 Differential Revision: D14576559 Pulled By: cpojer fbshipit-source-id: 4ef727e1d9aa7646359b63468285fec1f8f1651b
1 parent 3b91a7e commit 836a8e0

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Libraries/LinkingIOS/RCTLinkingManager.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222

2323
+ (BOOL)application:(nonnull UIApplication *)application
2424
continueUserActivity:(nonnull NSUserActivity *)userActivity
25-
restorationHandler:(nonnull void (^)(NSArray *__nullable))restorationHandler;
25+
restorationHandler:
26+
#if __has_include(<UIKitCore/UIUserActivity.h>) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 12000) /* __IPHONE_12_0 */
27+
(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler;
28+
#else
29+
(nonnull void (^)(NSArray *_Nullable))restorationHandler;
30+
#endif
2631

2732
@end

Libraries/LinkingIOS/RCTLinkingManager.m

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,12 @@ + (BOOL)application:(UIApplication *)application
6767

6868
+ (BOOL)application:(UIApplication *)application
6969
continueUserActivity:(NSUserActivity *)userActivity
70-
restorationHandler:(void (^)(NSArray * __nullable))restorationHandler
71-
{
70+
restorationHandler:
71+
#if __has_include(<UIKitCore/UIUserActivity.h>) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 12000) /* __IPHONE_12_0 */
72+
(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler {
73+
#else
74+
(nonnull void (^)(NSArray *_Nullable))restorationHandler {
75+
#endif
7276
if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
7377
NSDictionary *payload = @{@"url": userActivity.webpageURL.absoluteString};
7478
[[NSNotificationCenter defaultCenter] postNotificationName:kOpenURLNotification

0 commit comments

Comments
 (0)