Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUGFIX][IOS][LINKS] Update linking restorationHandler implementation for iOS12 #2216

Merged
merged 6 commits into from
Jun 10, 2019
Merged

[BUGFIX][IOS][LINKS] Update linking restorationHandler implementation for iOS12 #2216

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fbe4c24
Update iOS linking restorationHandler implementation
xzilja Jun 8, 2019
446afc7
ignore - re-triggering ci
Salakar Jun 9, 2019
fff0afd
🙄
xzilja Jun 9, 2019
4db2ae7
Merge branch 'fix/linking' of https://github.com/invertase/react-nati…
xzilja Jun 9, 2019
d1d520b
Merge branch 'v5.x.x' into fix/linking
mikehardy Jun 10, 2019
da16691
Merge branch 'v5.x.x' into fix/linking
mikehardy Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions ios/RNFirebase/links/RNFirebaseLinks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,23 @@
#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>

@interface RNFirebaseLinks : RCTEventEmitter<RCTBridgeModule>
@interface RNFirebaseLinks : RCTEventEmitter <RCTBridgeModule>

+ (_Nonnull instancetype)instance;

- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options;
- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray *))restorationHandler;
- (BOOL)application:(UIApplication *)app
openURL:(NSURL *)url
options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options;

- (BOOL)application:(UIApplication *)application
continueUserActivity:(NSUserActivity *)userActivity
restorationHandler:
#if defined(__IPHONE_12_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0)
(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler;
#else
(nonnull void (^)(NSArray *_Nullable))restorationHandler;
#endif // __IPHONE_12_0

- (void)sendLink:(NSString *)link;

@end
Expand All @@ -23,4 +34,3 @@
#endif

#endif

7 changes: 6 additions & 1 deletion ios/RNFirebase/links/RNFirebaseLinks.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ - (BOOL)application:(UIApplication *)app

- (BOOL)application:(UIApplication *)application
continueUserActivity:(NSUserActivity *)userActivity
restorationHandler:(void (^)(NSArray *))restorationHandler {
restorationHandler:
#if defined(__IPHONE_12_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0)
(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler {
#else
(nonnull void (^)(NSArray *_Nullable))restorationHandler {
#endif // __IPHONE_12_0
if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
return [[FIRDynamicLinks dynamicLinks]
handleUniversalLink:userActivity.webpageURL
Expand Down