From fbe4c240e097da0591a33f433b682c47be7c54dd Mon Sep 17 00:00:00 2001 From: IljaDaderko Date: Sat, 8 Jun 2019 17:41:01 +0300 Subject: [PATCH 1/3] Update iOS linking restorationHandler implementation --- ios/RNFirebase/links/RNFirebaseLinks.h | 16 ++++++++++++---- ios/RNFirebase/links/RNFirebaseLinks.m | 7 ++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ios/RNFirebase/links/RNFirebaseLinks.h b/ios/RNFirebase/links/RNFirebaseLinks.h index f2b6844508..29fbc75b19 100644 --- a/ios/RNFirebase/links/RNFirebaseLinks.h +++ b/ios/RNFirebase/links/RNFirebaseLinks.h @@ -7,12 +7,21 @@ #import #import -@interface RNFirebaseLinks : RCTEventEmitter +@interface RNFirebaseLinks : RCTEventEmitter + (_Nonnull instancetype)instance; -- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options; -- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray *))restorationHandler; +- (BOOL)application:(UIApplication *)app + openURL:(NSURL *)url + options:(NSDictionary *)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> *_Nullable))restorationHandler; + #elses + (nonnull void (^)(NSArray *_Nullable))restorationHandler; + #endif // __IPHONE_12_0 - (void)sendLink:(NSString *)link; @end @@ -23,4 +32,3 @@ #endif #endif - diff --git a/ios/RNFirebase/links/RNFirebaseLinks.m b/ios/RNFirebase/links/RNFirebaseLinks.m index 1c501ca684..ea4108226a 100644 --- a/ios/RNFirebase/links/RNFirebaseLinks.m +++ b/ios/RNFirebase/links/RNFirebaseLinks.m @@ -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> *_Nullable))restorationHandler { + #else + (nonnull void (^)(NSArray *_Nullable))restorationHandler { + #endif // __IPHONE_12_0 if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) { return [[FIRDynamicLinks dynamicLinks] handleUniversalLink:userActivity.webpageURL From 446afc7a5e39966ff9dbd6786a46f22b4df1397b Mon Sep 17 00:00:00 2001 From: Mike Diarmid Date: Sun, 9 Jun 2019 03:10:51 +0100 Subject: [PATCH 2/3] ignore - re-triggering ci --- ios/RNFirebase/links/RNFirebaseLinks.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/RNFirebase/links/RNFirebaseLinks.h b/ios/RNFirebase/links/RNFirebaseLinks.h index 29fbc75b19..a8a7806742 100644 --- a/ios/RNFirebase/links/RNFirebaseLinks.h +++ b/ios/RNFirebase/links/RNFirebaseLinks.h @@ -14,6 +14,7 @@ - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options; + - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler: @@ -22,6 +23,7 @@ #elses (nonnull void (^)(NSArray *_Nullable))restorationHandler; #endif // __IPHONE_12_0 + - (void)sendLink:(NSString *)link; @end From fff0afddfe2b19d6756b21dcf8dc58859d54eeec Mon Sep 17 00:00:00 2001 From: IljaDaderko Date: Sun, 9 Jun 2019 08:32:11 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/RNFirebase/links/RNFirebaseLinks.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/RNFirebase/links/RNFirebaseLinks.h b/ios/RNFirebase/links/RNFirebaseLinks.h index 29fbc75b19..4d9db2bca4 100644 --- a/ios/RNFirebase/links/RNFirebaseLinks.h +++ b/ios/RNFirebase/links/RNFirebaseLinks.h @@ -19,7 +19,7 @@ restorationHandler: #if defined(__IPHONE_12_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0) (nonnull void (^)(NSArray> *_Nullable))restorationHandler; - #elses + #else (nonnull void (^)(NSArray *_Nullable))restorationHandler; #endif // __IPHONE_12_0 - (void)sendLink:(NSString *)link;