- Modified build script to include symbolic link to module map.

Joseph Kalash · Joseph Kalash · commit c6a5d66335da · 2016-09-08T18:33:34.000-07:00
- Modified stringify method to exclude nil objects.
diff --git a/OneSignal.podspec b/OneSignal.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "OneSignal"
-  s.version          = "2.1.3"
+  s.version          = "2.1.4"
   s.summary          = "OneSignal push notification library for mobile apps."
   s.homepage         = "https://onesignal.com"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
diff --git a/iOS_SDK/Framework/OneSignal.framework/Modules b/iOS_SDK/Framework/OneSignal.framework/Modules
@@ -0,0 +1 @@
+Versions/Current/Modules
diff --git a/iOS_SDK/Framework/OneSignal.framework/Versions/A/Modules/module.modulemap b/iOS_SDK/Framework/OneSignal.framework/Versions/A/Modules/module.modulemap
diff --git a/iOS_SDK/Framework/OneSignal.framework/Versions/A/OneSignal b/iOS_SDK/Framework/OneSignal.framework/Versions/A/OneSignal
diff --git a/iOS_SDK/Framework/OneSignal.framework/Versions/B/Modules/module.modulemap b/iOS_SDK/Framework/OneSignal.framework/Versions/B/Modules/module.modulemap
@@ -0,0 +1,5 @@
+framework module OneSignal {
+    umbrella header "OneSignal.h"
+    export *
+    module * { export * }
+}
diff --git a/iOS_SDK/Framework/OneSignal.framework/Versions/B/OneSignal b/iOS_SDK/Framework/OneSignal.framework/Versions/B/OneSignal
diff --git a/iOS_SDK/OneSignal.xcodeproj/project.pbxproj b/iOS_SDK/OneSignal.xcodeproj/project.pbxproj
@@ -355,7 +355,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Purpose:\n#   Automatically create a Universal static library for iPhone + iPad + iPhone Simulator from within XCode\n\nset -e\nset -o pipefail\n\n#################[ Tests: helps workaround any future bugs in Xcode ]########\n#\nDEBUG_THIS_SCRIPT=\"true\"\n\nif [ $DEBUG_THIS_SCRIPT = \"true\" ]\nthen\necho \"########### TESTS #############\"\necho \"Use the following variables when debugging this script; note that they may change on recursions\"\necho \"BUILD_DIR = $BUILD_DIR\"\necho \"BUILD_ROOT = $BUILD_ROOT\"\necho \"CONFIGURATION_BUILD_DIR = $CONFIGURATION_BUILD_DIR\"\necho \"BUILT_PRODUCTS_DIR = $BUILT_PRODUCTS_DIR\"\necho \"CONFIGURATION_TEMP_DIR = $CONFIGURATION_TEMP_DIR\"\necho \"TARGET_BUILD_DIR = $TARGET_BUILD_DIR\"\nfi\n\n#####################[ part 1 ]##################\n# First, work out the BASESDK version number (NB: Apple ought to report this, but they hide it)\n#    (incidental: searching for substrings in sh is a nightmare! Sob)\n\nSDK_VERSION=$(echo ${SDK_NAME} | grep -o '.\\{3\\}$')\n\n# Next, work out if we're in SIM or DEVICE\n\nif [ ${PLATFORM_NAME} = \"iphonesimulator\" ]\nthen\nOTHER_SDK_TO_BUILD=iphoneos${SDK_VERSION}\nelse\nOTHER_SDK_TO_BUILD=iphonesimulator${SDK_VERSION}\nfi\n\necho \"XCode has selected SDK: ${PLATFORM_NAME} with version: ${SDK_VERSION} (although back-targetting: ${IPHONEOS_DEPLOYMENT_TARGET})\"\necho \"...therefore, OTHER_SDK_TO_BUILD = ${OTHER_SDK_TO_BUILD}\"\n#\n#####################[ end of part 1 ]##################\n\n#####################[ part 2 ]##################\n# IF this is the original invocation, invoke WHATEVER other builds are required\n# Xcode is already building ONE target...\n# ...but this is a LIBRARY, so Apple is wrong to set it to build just one.\n# ...we need to build ALL targets\n# ...we MUST NOT re-build the target that is ALREADY being built: Xcode WILL CRASH YOUR COMPUTER if you try this (infinite recursion!)\n#\n# So: build ONLY the missing platforms/configurations.\n\nif [ \"true\" == ${ALREADYINVOKED:-false} ]\nthen\necho \"RECURSION: I am NOT the root invocation, so I'm NOT going to recurse\"\nelse\n# CRITICAL:\n# Prevent infinite recursion (Xcode sucks)\nexport ALREADYINVOKED=\"true\"\n\necho \"RECURSION: I am the root ... recursing all missing build targets NOW...\"\necho \"RECURSION: ...about to invoke: xcodebuild -configuration \\\"${CONFIGURATION}\\\" -project \\\"${PROJECT_NAME}.xcodeproj\\\" -target \\\"${TARGET_NAME}\\\" -sdk \\\"${OTHER_SDK_TO_BUILD}\\\" ${ACTION} RUN_CLANG_STATIC_ANALYZER=NO\" BUILD_DIR=\\\"${BUILD_DIR}\\\" BUILD_ROOT=\\\"${BUILD_ROOT}\\\" SYMROOT=\\\"${SYMROOT}\\\"\n\nxcodebuild -configuration \"${CONFIGURATION}\" -project \"${PROJECT_NAME}.xcodeproj\" -target \"${TARGET_NAME}\" -sdk \"${OTHER_SDK_TO_BUILD}\" ${ACTION} RUN_CLANG_STATIC_ANALYZER=NO BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" SYMROOT=\"${SYMROOT}\"\n\nACTION=\"build\"\n\n#Merge all platform binaries as a fat binary for each configurations.\n\n# Calculate where the (multiple) built files are coming from:\nCURRENTCONFIG_DEVICE_DIR=${SYMROOT}/${CONFIGURATION}-iphoneos\nCURRENTCONFIG_SIMULATOR_DIR=${SYMROOT}/${CONFIGURATION}-iphonesimulator\n\necho \"Taking device build from: ${CURRENTCONFIG_DEVICE_DIR}\"\necho \"Taking simulator build from: ${CURRENTCONFIG_SIMULATOR_DIR}\"\n\nCREATING_UNIVERSAL_DIR=${SYMROOT}/${CONFIGURATION}-universal\necho \"...I will output a universal build to: ${CREATING_UNIVERSAL_DIR}\"\n\n# ... remove the products of previous runs of this script\n#      NB: this directory is ONLY created by this script - it should be safe to delete!\n\nrm -rf \"${CREATING_UNIVERSAL_DIR}\"\nmkdir \"${CREATING_UNIVERSAL_DIR}\"\n\n#\necho \"lipo: for current configuration (${CONFIGURATION}) creating output file: ${CREATING_UNIVERSAL_DIR}/${EXECUTABLE_NAME}\"\nxcrun -sdk iphoneos lipo -create -output \"${CREATING_UNIVERSAL_DIR}/${EXECUTABLE_NAME}\" \"${CURRENTCONFIG_DEVICE_DIR}/${EXECUTABLE_NAME}\" \"${CURRENTCONFIG_SIMULATOR_DIR}/${EXECUTABLE_NAME}\"\n\n#########\n#\n# Added: StackOverflow suggestion to also copy \"include\" files\n#    (untested, but should work OK)\n#\necho \"Fetching headers from ${PUBLIC_HEADERS_FOLDER_PATH}\"\necho \"  (if you embed your library project in another project, you will need to add\"\necho '   a \"User Search Headers\" build setting of: (NB INCLUDE THE DOUBLE QUOTES BELOW!)'\necho '        \"$(TARGET_BUILD_DIR)/usr/local/include/\"'\nif [ -d \"${CURRENTCONFIG_DEVICE_DIR}${PUBLIC_HEADERS_FOLDER_PATH}\" ]\nthen\nmkdir -p \"${CREATING_UNIVERSAL_DIR}${PUBLIC_HEADERS_FOLDER_PATH}\"\n# * needs to be outside the double quotes?\ncp -r \"${CURRENTCONFIG_DEVICE_DIR}${PUBLIC_HEADERS_FOLDER_PATH}\"* \"${CREATING_UNIVERSAL_DIR}${PUBLIC_HEADERS_FOLDER_PATH}\"\nfi\nfi\n\nif [ -d \"${SRCROOT}/build\" ]\nthen\nrm -rf \"${SRCROOT}/build\"\nfi\n\n#Move the libs to create framework for both XC & XC8\n\nSIMULATOR_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/libOneSignal.a\" &&\nDEVICE_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos/libOneSignal.a\" &&\nUNIVERSAL_LIBRARY_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphoneuniversal\" &&\nUNIVERSAL_LIBRARY_PATH=\"${UNIVERSAL_LIBRARY_DIR}/OneSignal\" &&\nFRAMEWORK=\"${SRCROOT}/Framework/OneSignal.framework\" &&\n\n# Create framework directory structure.\nrm -rf \"${FRAMEWORK}\" &&\nmkdir -p \"${UNIVERSAL_LIBRARY_DIR}\" &&\nmkdir -p \"${FRAMEWORK}/Versions/A/Headers\" &&\nmkdir -p \"${FRAMEWORK}/Modules\"\n\n# Generate universal binary for the device and simulator for the stable version\nlipo \"${SIMULATOR_LIBRARY_PATH}\" \"${DEVICE_LIBRARY_PATH}\" -create -output \"${UNIVERSAL_LIBRARY_PATH}\" &&\n\n# Move files to appropriate locations in framework paths for stable version\ncp \"${UNIVERSAL_LIBRARY_PATH}\" \"${FRAMEWORK}/Versions/A\" &&\nln -s \"A\" \"${FRAMEWORK}/Versions/Current\" &&\nln -s \"Versions/Current/Headers\" \"${FRAMEWORK}/Headers\" &&\nln -s \"Versions/Current/${PRODUCT_NAME}\" \"${FRAMEWORK}/${PRODUCT_NAME}\" &&\n\n#copy header file\ncp \"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/include/OneSignal/OneSignal.h\" \"${FRAMEWORK}/Versions/A/Headers/OneSignal.h\"\n\n#Generate module.modulemap\ntouch \"${FRAMEWORK}/Modules/module.modulemap\"\necho \"framework module OneSignal {\" >> \"${FRAMEWORK}/Modules/module.modulemap\"\necho \"    umbrella header \\\"OneSignal.h\\\"\" >> \"${FRAMEWORK}/Modules/module.modulemap\"\necho \"    export *\" >> \"${FRAMEWORK}/Modules/module.modulemap\"\necho \"    module * { export * }\" >> \"${FRAMEWORK}/Modules/module.modulemap\"\necho \"}\" >> \"${FRAMEWORK}/Modules/module.modulemap\"\n\n# cleanup\nrm -rf \"${SRCROOT}/build\"";
+			shellScript = "# Purpose:\n#   Automatically create a Universal static library for iPhone + iPad + iPhone Simulator from within XCode\n\nset -e\nset -o pipefail\n\n#################[ Tests: helps workaround any future bugs in Xcode ]########\n#\nDEBUG_THIS_SCRIPT=\"true\"\n\nif [ $DEBUG_THIS_SCRIPT = \"true\" ]\nthen\necho \"########### TESTS #############\"\necho \"Use the following variables when debugging this script; note that they may change on recursions\"\necho \"BUILD_DIR = $BUILD_DIR\"\necho \"BUILD_ROOT = $BUILD_ROOT\"\necho \"CONFIGURATION_BUILD_DIR = $CONFIGURATION_BUILD_DIR\"\necho \"BUILT_PRODUCTS_DIR = $BUILT_PRODUCTS_DIR\"\necho \"CONFIGURATION_TEMP_DIR = $CONFIGURATION_TEMP_DIR\"\necho \"TARGET_BUILD_DIR = $TARGET_BUILD_DIR\"\nfi\n\n#####################[ part 1 ]##################\n# First, work out the BASESDK version number (NB: Apple ought to report this, but they hide it)\n#    (incidental: searching for substrings in sh is a nightmare! Sob)\n\nSDK_VERSION=$(echo ${SDK_NAME} | grep -o '.\\{3\\}$')\n\n# Next, work out if we're in SIM or DEVICE\n\nif [ ${PLATFORM_NAME} = \"iphonesimulator\" ]\nthen\nOTHER_SDK_TO_BUILD=iphoneos${SDK_VERSION}\nelse\nOTHER_SDK_TO_BUILD=iphonesimulator${SDK_VERSION}\nfi\n\necho \"XCode has selected SDK: ${PLATFORM_NAME} with version: ${SDK_VERSION} (although back-targetting: ${IPHONEOS_DEPLOYMENT_TARGET})\"\necho \"...therefore, OTHER_SDK_TO_BUILD = ${OTHER_SDK_TO_BUILD}\"\n#\n#####################[ end of part 1 ]##################\n\n#####################[ part 2 ]##################\n# IF this is the original invocation, invoke WHATEVER other builds are required\n# Xcode is already building ONE target...\n# ...but this is a LIBRARY, so Apple is wrong to set it to build just one.\n# ...we need to build ALL targets\n# ...we MUST NOT re-build the target that is ALREADY being built: Xcode WILL CRASH YOUR COMPUTER if you try this (infinite recursion!)\n#\n# So: build ONLY the missing platforms/configurations.\n\nif [ \"true\" == ${ALREADYINVOKED:-false} ]\nthen\necho \"RECURSION: I am NOT the root invocation, so I'm NOT going to recurse\"\nelse\n# CRITICAL:\n# Prevent infinite recursion (Xcode sucks)\nexport ALREADYINVOKED=\"true\"\n\necho \"RECURSION: I am the root ... recursing all missing build targets NOW...\"\necho \"RECURSION: ...about to invoke: xcodebuild -configuration \\\"${CONFIGURATION}\\\" -project \\\"${PROJECT_NAME}.xcodeproj\\\" -target \\\"${TARGET_NAME}\\\" -sdk \\\"${OTHER_SDK_TO_BUILD}\\\" ${ACTION} RUN_CLANG_STATIC_ANALYZER=NO\" BUILD_DIR=\\\"${BUILD_DIR}\\\" BUILD_ROOT=\\\"${BUILD_ROOT}\\\" SYMROOT=\\\"${SYMROOT}\\\"\n\nxcodebuild -configuration \"${CONFIGURATION}\" -project \"${PROJECT_NAME}.xcodeproj\" -target \"${TARGET_NAME}\" -sdk \"${OTHER_SDK_TO_BUILD}\" ${ACTION} RUN_CLANG_STATIC_ANALYZER=NO BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" SYMROOT=\"${SYMROOT}\"\n\nACTION=\"build\"\n\n#Merge all platform binaries as a fat binary for each configurations.\n\n# Calculate where the (multiple) built files are coming from:\nCURRENTCONFIG_DEVICE_DIR=${SYMROOT}/${CONFIGURATION}-iphoneos\nCURRENTCONFIG_SIMULATOR_DIR=${SYMROOT}/${CONFIGURATION}-iphonesimulator\n\necho \"Taking device build from: ${CURRENTCONFIG_DEVICE_DIR}\"\necho \"Taking simulator build from: ${CURRENTCONFIG_SIMULATOR_DIR}\"\n\nCREATING_UNIVERSAL_DIR=${SYMROOT}/${CONFIGURATION}-universal\necho \"...I will output a universal build to: ${CREATING_UNIVERSAL_DIR}\"\n\n# ... remove the products of previous runs of this script\n#      NB: this directory is ONLY created by this script - it should be safe to delete!\n\nrm -rf \"${CREATING_UNIVERSAL_DIR}\"\nmkdir \"${CREATING_UNIVERSAL_DIR}\"\n\n#\necho \"lipo: for current configuration (${CONFIGURATION}) creating output file: ${CREATING_UNIVERSAL_DIR}/${EXECUTABLE_NAME}\"\nxcrun -sdk iphoneos lipo -create -output \"${CREATING_UNIVERSAL_DIR}/${EXECUTABLE_NAME}\" \"${CURRENTCONFIG_DEVICE_DIR}/${EXECUTABLE_NAME}\" \"${CURRENTCONFIG_SIMULATOR_DIR}/${EXECUTABLE_NAME}\"\n\n#########\n#\n# Added: StackOverflow suggestion to also copy \"include\" files\n#    (untested, but should work OK)\n#\necho \"Fetching headers from ${PUBLIC_HEADERS_FOLDER_PATH}\"\necho \"  (if you embed your library project in another project, you will need to add\"\necho '   a \"User Search Headers\" build setting of: (NB INCLUDE THE DOUBLE QUOTES BELOW!)'\necho '        \"$(TARGET_BUILD_DIR)/usr/local/include/\"'\nif [ -d \"${CURRENTCONFIG_DEVICE_DIR}${PUBLIC_HEADERS_FOLDER_PATH}\" ]\nthen\nmkdir -p \"${CREATING_UNIVERSAL_DIR}${PUBLIC_HEADERS_FOLDER_PATH}\"\n# * needs to be outside the double quotes?\ncp -r \"${CURRENTCONFIG_DEVICE_DIR}${PUBLIC_HEADERS_FOLDER_PATH}\"* \"${CREATING_UNIVERSAL_DIR}${PUBLIC_HEADERS_FOLDER_PATH}\"\nfi\nfi\n\nif [ -d \"${SRCROOT}/build\" ]\nthen\nrm -rf \"${SRCROOT}/build\"\nfi\n\n#Move the libs to create framework for both XC & XC8\n\nSIMULATOR_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/libOneSignal.a\" &&\nDEVICE_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos/libOneSignal.a\" &&\nUNIVERSAL_LIBRARY_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphoneuniversal\" &&\nUNIVERSAL_LIBRARY_PATH=\"${UNIVERSAL_LIBRARY_DIR}/OneSignal\" &&\nFRAMEWORK=\"${SRCROOT}/Framework/OneSignal.framework\" &&\n\n# Create framework directory structure.\nrm -rf \"${FRAMEWORK}\" &&\nmkdir -p \"${UNIVERSAL_LIBRARY_DIR}\" &&\nmkdir -p \"${FRAMEWORK}/Versions/A/Headers\" &&\nmkdir -p \"${FRAMEWORK}/Versions/A/Modules\"\n\n# Generate universal binary for the device and simulator for the stable version\nlipo \"${SIMULATOR_LIBRARY_PATH}\" \"${DEVICE_LIBRARY_PATH}\" -create -output \"${UNIVERSAL_LIBRARY_PATH}\" &&\n\n# Move files to appropriate locations in framework paths for stable version\ncp \"${UNIVERSAL_LIBRARY_PATH}\" \"${FRAMEWORK}/Versions/A\" &&\nln -s \"A\" \"${FRAMEWORK}/Versions/Current\" &&\nln -s \"Versions/Current/Headers\" \"${FRAMEWORK}/Headers\" &&\nln -s \"Versions/Current/${PRODUCT_NAME}\" \"${FRAMEWORK}/${PRODUCT_NAME}\" &&\n\n#copy header file\ncp \"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/include/OneSignal/OneSignal.h\" \"${FRAMEWORK}/Versions/A/Headers/OneSignal.h\"\n\n#Generate module.modulemap\ntouch \"${FRAMEWORK}/Versions/A/Modules/module.modulemap\"\necho \"framework module OneSignal {\" >> \"${FRAMEWORK}/Versions/A/Modules/module.modulemap\"\necho \"    umbrella header \\\"OneSignal.h\\\"\" >> \"${FRAMEWORK}/Versions/A/Modules/module.modulemap\"\necho \"    export *\" >> \"${FRAMEWORK}/Versions/A/Modules/module.modulemap\"\necho \"    module * { export * }\" >> \"${FRAMEWORK}/Versions/A/Modules/module.modulemap\"\necho \"}\" >> \"${FRAMEWORK}/Versions/A/Modules/module.modulemap\"\n# Create symbolic link to the map\nln -s \"Versions/Current/Modules\" \"${FRAMEWORK}/Modules\"\n\n# cleanup\nrm -rf \"${SRCROOT}/build\"";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/iOS_SDK/OneSignal/OneSignal.m b/iOS_SDK/OneSignal/OneSignal.m
@@ -71,7 +71,7 @@
 
 @implementation OneSignal
     
-NSString* const ONESIGNAL_VERSION = @"020103";
+NSString* const ONESIGNAL_VERSION = @"020104";
 static NSString* mSDKType = @"native";
 static BOOL coldStartFromTapOnNotification = NO;
 static BOOL registeredWithApple = NO; //Has attempted to register for push notifications with Apple.
diff --git a/iOS_SDK/OneSignal/OneSignalHelper.m b/iOS_SDK/OneSignal/OneSignalHelper.m
@@ -173,22 +173,35 @@ - (id)initWithPayload:(OSNotificationPayload *)payload displayType:(OSNotificati
 }
 
 - (NSString*)stringify {
-    NSDictionary * obj = @{@"payload" : @{@"notificationID" : self.payload.notificationID ? self.payload.notificationID : @"",
-                                          @"contentAvailable" : self.payload.contentAvailable ? @(self.payload.contentAvailable) : @(0),
-                                          @"badge" : self.payload.badge ? @(self.payload.badge) : @0,
-                                          @"sound" : self.payload.sound ? self.payload.sound : @"",
-                                          @"title" : self.payload.title ? self.payload.title : @"",
-                                          @"body" : self.payload.body ? self.payload.body : @"",
-                                          @"subtitle" : self.payload.subtitle ? self.payload.subtitle : @"",
-                                          @"launchURL" : self.payload.launchURL ? self.payload.launchURL : @"",
-                                          @"additionalData" : self.payload.additionalData ? self.payload.additionalData : @"",
-                                          @"actionButtons" : self.payload.actionButtons ? self.payload.actionButtons : @"",
-                                          @"rawPayload" : self.payload.rawPayload ? self.payload.rawPayload : @{}
-                                          },
-                           @"displayType" : self.displayType ? @(self.displayType) : @(0),
-                           @"shown" : @(self.shown),
-                           @"silentNotification" : @(self.silentNotification),
+    
+    NSDictionary * obj = @{@"payload" : @{@"notificationID" : self.payload.notificationID,
+                                          @"sound" : self.payload.sound,
+                                          @"title" : self.payload.title,
+                                          @"body" : self.payload.body,
+                                          @"subtitle" : self.payload.subtitle,
+                                          @"launchURL" : self.payload.launchURL,
+                                          @"additionalData" : self.payload.additionalData,
+                                          @"actionButtons" : self.payload.actionButtons,
+                                          @"rawPayload" : self.payload.rawPayload
+                                          }
                            };
+    
+    if(self.payload.contentAvailable)
+        [obj[@"payload"] setValue:@(self.payload.contentAvailable) forKey: @"contentAvailable"];
+    
+    if(self.payload.badge)
+        [obj[@"payload"] setValue:@(self.payload.badge) forKey: @"badge"];
+    
+    if(self.displayType)
+        [obj setValue:@(self.displayType) forKey: @"displayType"];
+    
+    if(self.shown)
+        [obj setValue:@(self.shown) forKey: @"shown"];
+    
+    if(self.silentNotification)
+        [obj setValue:@(self.silentNotification) forKey: @"silentNotification"];
+    
+
     //Convert obj into a serialized
     NSError * err;
     NSData * jsonData = [NSJSONSerialization  dataWithJSONObject:obj options:0 error:&err];
@@ -218,12 +231,14 @@ - (NSString*)stringify {
                                                                 error:&jsonError];
     
     
-    NSDictionary * obj = @{@"action" : @{@"actionID" : self.action.actionID ? self.action.actionID : @"",
-                                         @"type" : @(self.action.type)
+    NSDictionary * obj = @{@"action" : @{@"actionID" : self.action.actionID
                                          },
-                           @"notification" : notifDict ? notifDict : @{}
+                           @"notification" : notifDict
                            };
     
+    if(self.action.type)
+        [obj[@"action"] setValue:@(self.action.type) forKey: @"type"];
+    
     //Convert obj into a serialized
     NSError * err;
     NSData * jsonData = [NSJSONSerialization  dataWithJSONObject:obj options:0 error:&err];
diff --git a/iOS_SDK/OneSignal/UIApplication+Swizzling.m b/iOS_SDK/OneSignal/UIApplication+Swizzling.m
@@ -260,6 +260,8 @@ -(void)oneSignalApplicationWillTerminate:(UIApplication *)application {
 
 #define SYSTEM_VERSION_LESS_THAN_OR_EQUAL_TO(v)     ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedDescending)
 + (void)load {
+    
+    NSLog(@"----- LOOOOGGGGG ------");
     if (SYSTEM_VERSION_LESS_THAN_OR_EQUAL_TO(@"7.0"))
         return;
     
