Merge pull request #460 from BranchMetrics/supporting-swift

launchOptions dictionary contains null values if passed from Swift

Author: derrickstaten

Branch-SDK/Branch-SDK/Branch.h

@@ -448,7 +448,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  but that UL is not a Facebook UL. Some developers prefer not to modify
  `application:didFinishLaunchingWithOptions:` to always return `YES` and should use this method instead.
  */
-- (void)accountForFacebookSDKPreventingAppLaunch;
+- (void)accountForFacebookSDKPreventingAppLaunch __attribute__((deprecated(("Please ensure application:didFinishLaunchingWithOptions: always returns YES/true instead of using this method. It will be removed in a future release."))));
 
 - (void)suppressWarningLogs;
 

Branch-SDK/Branch-SDK/Branch.m

@@ -339,14 +339,15 @@ - (void)initSessionWithLaunchOptions:(NSDictionary *)options isReferrable:(BOOL)
     }
 
     if ([BNCSystemObserver getOSVersion].integerValue >= 8) {
-        if (![options objectForKey:UIApplicationLaunchOptionsURLKey] && ![options objectForKey:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {
+        if (![options.allKeys containsObject:UIApplicationLaunchOptionsURLKey] && ![options.allKeys containsObject:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {
             // If Facebook SDK is present, call deferred app link check here
             if (![self checkFacebookAppLinks]) {
                 [self initUserSessionAndCallCallback:YES];
             }
         }
-        else if ([options objectForKey:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {
+        else if ([options.allKeys containsObject:UIApplicationLaunchOptionsUserActivityDictionaryKey]) {
             if (self.accountForFacebookSDK) {
+                // does not work in Swift, because Objective-C to Swift interop is bad
                 id activity = [[options objectForKey:UIApplicationLaunchOptionsUserActivityDictionaryKey] objectForKey:@"UIApplicationLaunchOptionsUserActivityKey"];
                 if (activity && [activity isKindOfClass:[NSUserActivity class]]) {
                     [self continueUserActivity:activity];
@@ -356,7 +357,7 @@ - (void)initSessionWithLaunchOptions:(NSDictionary *)options isReferrable:(BOOL)
             self.preferenceHelper.shouldWaitForInit = YES;
         }
     }
-    else if (![options objectForKey:UIApplicationLaunchOptionsURLKey]) {
+    else if (![options.allKeys containsObject:UIApplicationLaunchOptionsURLKey]) {
         [self initUserSessionAndCallCallback:YES];
     }
 }