Merge pull request #283 from BranchMetrics/ios-warnings

Suppress some warnings with Xcode 9
BranchMetrics · Oct 17, 2017 · 6c33b7c · 6c33b7c
2 parents 5434a1d + 850674b
commit 6c33b7c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/ios/RNBranch.h b/ios/RNBranch.h
@@ -17,7 +17,10 @@ extern NSString * _Nonnull const RNBranchLinkOpenedNotificationLinkPropertiesKey
 
 + (void)initSessionWithLaunchOptions:(NSDictionary * _Nullable)launchOptions isReferrable:(BOOL)isReferrable;
 + (BOOL)handleDeepLink:(NSURL * _Nonnull)url __deprecated_msg("Please use [RNBranch.branch application:openURL:options] or [RNBranch.branch application:openURL:sourceApplication:annotation:] instead.");
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpartial-availability"
 + (BOOL)continueUserActivity:(NSUserActivity * _Nonnull)userActivity;
+#pragma clang diagnostic pop
 
 // Must be called before any other static method below
 + (void)useTestInstance;

diff --git a/ios/RNBranch.m b/ios/RNBranch.m
@@ -159,9 +159,12 @@ + (BOOL)handleDeepLink:(NSURL *)url {
     return handled;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpartial-availability"
 + (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
     return [self.branch continueUserActivity:userActivity];
 }
+#pragma clang diagnostic pop
 
 #pragma mark - Object lifecycle
 
@@ -186,8 +189,13 @@ - (void) dealloc {
 - (UIViewController *)currentViewController
 {
     UIViewController *current = [UIApplication sharedApplication].keyWindow.rootViewController;
-    while (current.presentedViewController && ![current.presentedViewController isKindOfClass:UIAlertController.class]) {
-        current = current.presentedViewController;
+    if (@available(iOS 8.0, *)) {
+        while (current.presentedViewController && ![current.presentedViewController isKindOfClass:UIAlertController.class]) {
+            current = current.presentedViewController;
+        }
+    } else {
+        // RN Requires iOS 8. Nothing to do here. Still.
+        while (current.presentedViewController) current = current.presentedViewController;
     }
     return current;
 }