Feature/si 112 launch options change (#30)

* Adds in an overloaded function for initWithApiKey to allow for custom launchOptions.

* removing unnecessary header for sharedInstance

* updating bool type to be compatible w/ objc-swift

Author: davidtruong

Iterable-iOS-SDK/IterableAPI.h

@@ -91,6 +91,20 @@ typedef NS_ENUM(NSInteger, PushServicePlatform) {
  */
 - (instancetype) initWithApiKey:(NSString *)apiKey andEmail:(NSString *)email launchOptions:(nullable NSDictionary *)launchOptions;
 
+/*!
+ @method
+ 
+ @abstract Initializes Iterable with launchOptions
+ 
+ @param apiKey                  your Iterable apiKey
+ @param email                   the email of the user logged in
+ @param launchOptions           launchOptions from application:didFinishLaunchingWithOptions or custom launchOptions
+ @param useCustomLaunchOptions  whether or not to use the custom launchOption without the UIApplicationLaunchOptionsRemoteNotificationKey
+ 
+ @return an instance of IterableAPI
+ */
+- (instancetype) initWithApiKey:(NSString *)apiKey andEmail:(NSString *)email launchOptions:(nullable NSDictionary *)launchOptions useCustomLaunchOptions:(BOOL)useCustomLaunchOptions;
+
 /*!
  @method
  
@@ -116,6 +130,20 @@ typedef NS_ENUM(NSInteger, PushServicePlatform) {
  */
 - (instancetype) initWithApiKey:(NSString *)apiKey andUserId:(NSString *)userId launchOptions:(nullable NSDictionary *)launchOptions;
 
+/*!
+ @method
+ 
+ @abstract Initializes Iterable with launchOptions
+ 
+ @param apiKey          your Iterable apiKey
+ @param userId          the userId of the user logged in
+ @param launchOptions   launchOptions from application:didFinishLaunchingWithOptions or custom launchOptions
+ @param useCustomLaunchOptions  whether or not to use the custom launchOption without the UIApplicationLaunchOptionsRemoteNotificationKey
+ 
+ @return an instance of IterableAPI
+ */
+- (instancetype) initWithApiKey:(NSString *)apiKey andUserId:(NSString *)userId launchOptions:(nullable NSDictionary *)launchOptions useCustomLaunchOptions:(BOOL)useCustomLaunchOptions;
+
 /*!
  @method
  

Iterable-iOS-SDK/IterableAPI.m

@@ -255,19 +255,39 @@ + (OnFailureHandler)defaultOnFailure:(NSString *)identifier
  
  @abstract creates an iterable session with launchOptions
  
- @param launchOptions   launchOptions from application:didFinishLaunchingWithOptions
+ @param launchOptions launchOptions from application:didFinishLaunchingWithOptions
  
  @return an instance of IterableAPI
  */
 - (instancetype)createSession:(NSDictionary *)launchOptions
+{
+    return [self createSession:launchOptions useCustomLaunchOptions:false];
+}
+
+/*!
+ @method
+ 
+ @abstract creates an iterable session with launchOptions
+ 
+ @param launchOptions launchOptions from application:didFinishLaunchingWithOptions or custom launchOptions
+ 
+ @param useCustomLaunchOptions whether or not to use the custom launchOption without the UIApplicationLaunchOptionsRemoteNotificationKey
+ 
+ @return an instance of IterableAPI
+ */
+- (instancetype)createSession:(NSDictionary *)launchOptions useCustomLaunchOptions:(BOOL)useCustomLaunchOptions
 {
     // the url session doesn't depend on any options/params, so we'll use a singleton that gets created whenever the class is instantiated
     // if it gets instantiated again that's fine; we don't need to reconfigure the session, just keep using the old singleton
     [self createUrlSession];
 
-    if (launchOptions && launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey]) {
-        // Automatically try to track a pushOpen
-        [self trackPushOpen:launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey]];
+    // Automatically try to track a pushOpen
+    if (launchOptions) {
+        if (useCustomLaunchOptions) {
+            [self trackPushOpen:launchOptions];
+        } else if (launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey]) {
+            [self trackPushOpen:launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey]];
+        }
     }
 
     return self;
@@ -277,37 +297,49 @@ - (instancetype)createSession:(NSDictionary *)launchOptions
 /// @name Implementations of things documents in IterableAPI.h
 //////////////////////////////////////////////////////////////
 
+// documented in IterableAPI.h
+- (instancetype)initWithApiKey:(NSString *)apiKey andEmail:(NSString *)email
+{
+    return [self initWithApiKey:apiKey andEmail:email launchOptions:nil];
+}
+
+// documented in IterableAPI.h
+- (instancetype)initWithApiKey:(NSString *)apiKey andUserId:(NSString *)userId
+{
+    return [self initWithApiKey:apiKey andUserId:userId launchOptions:nil];
+}
+
 // documented in IterableAPI.h
 - (instancetype)initWithApiKey:(NSString *)apiKey andEmail:(NSString *)email launchOptions:(NSDictionary *)launchOptions
 {
-    if (self = [super init]) {
-        _apiKey = [apiKey copy];
-        _email = [email copy];
-    }
-    
-    return [self createSession:launchOptions];
+    return [self initWithApiKey:apiKey andEmail:email launchOptions:launchOptions useCustomLaunchOptions:false];
 }
 
 // documented in IterableAPI.h
 - (instancetype)initWithApiKey:(NSString *)apiKey andUserId:(NSString *)userId launchOptions:(NSDictionary *)launchOptions
 {
-    if (self = [super init]) {
-        _apiKey = [apiKey copy];
-        _userId = [userId copy];
-    }
-    return [self createSession:launchOptions];
+    return [self initWithApiKey:apiKey andUserId:userId launchOptions:launchOptions useCustomLaunchOptions:false];
 }
 
 // documented in IterableAPI.h
-- (instancetype)initWithApiKey:(NSString *)apiKey andEmail:(NSString *)email
+- (instancetype)initWithApiKey:(NSString *)apiKey andEmail:(NSString *)email launchOptions:(NSDictionary *)launchOptions useCustomLaunchOptions:(BOOL)useCustomLaunchOptions
 {
-    return [self initWithApiKey:apiKey andEmail:email launchOptions:nil];
+    if (self = [super init]) {
+        _apiKey = [apiKey copy];
+        _email = [email copy];
+    }
+    
+    return [self createSession:launchOptions useCustomLaunchOptions:useCustomLaunchOptions];
 }
 
 // documented in IterableAPI.h
-- (instancetype)initWithApiKey:(NSString *)apiKey andUserId:(NSString *)userId
+- (instancetype)initWithApiKey:(NSString *)apiKey andUserId:(NSString *)userId launchOptions:(NSDictionary *)launchOptions useCustomLaunchOptions:(BOOL)useCustomLaunchOptions
 {
-    return [self initWithApiKey:apiKey andUserId:userId launchOptions:nil];
+    if (self = [super init]) {
+        _apiKey = [apiKey copy];
+        _userId = [userId copy];
+    }
+    return [self createSession:launchOptions useCustomLaunchOptions:useCustomLaunchOptions];
 }
 
 // documented in IterableAPI.h