Updated to latest native SDKs with bug fixes

* Compatibility fixes with other iOS notification plugins
  - Both local and remote on iOS 10
* Fixed issue with action.actionID and action.type not being set.
* Fixed issue with nest additional data values on Android.

Author: jkasten2

Unity4.7OneSignalExample/Assets/OneSignal/src/OneSignal.cs

@@ -422,9 +422,14 @@ private void onPushNotificationOpened(string jsonString) {
          Dictionary<string, object> jsonObject = Json.Deserialize(jsonString) as Dictionary<string, object>;
 
          OSNotificationAction action = new OSNotificationAction();
-         if (jsonObject.ContainsKey("actionID")) action.actionID = jsonObject["actionID"] as string;
-         if (jsonObject.ContainsKey("type"))
-            action.type = (OSNotificationAction.ActionType)Convert.ToInt32(jsonObject["type"]);
+         if (jsonObject.ContainsKey("action")) {
+            Dictionary<string, object> actionJsonObject = jsonObject["action"] as Dictionary<string, object>;
+            
+            if (actionJsonObject.ContainsKey("actionID"))
+               action.actionID = actionJsonObject["actionID"] as string;
+            if (actionJsonObject.ContainsKey("type"))
+               action.type = (OSNotificationAction.ActionType)Convert.ToInt32(actionJsonObject["type"]);
+         }
 
          OSNotificationOpenedResult result = new OSNotificationOpenedResult();
          result.notification = DictionaryToNotification((Dictionary<string, object>)jsonObject["notification"]);

Unity4.7OneSignalExample/Assets/OneSignal/src/OneSignalAndroid.cs

@@ -62,6 +62,7 @@ public void DeleteTags(IList<string> keys) {
       mOneSignal.Call("deleteTags", Json.Serialize(keys));
    }
 
+
    public void IdsAvailable() {
       mOneSignal.Call("idsAvailable");
    }

Unity4.7OneSignalExample/Assets/Plugins/Android/OneSignal/libs/OneSignalSDK.jar

@@ -54,8 +54,8 @@
 
 @protocol OSUserNotificationCenterDelegate <NSObject>
 @optional
-- (void)userNotificationCenter:(id)center willPresentNotification:(id)notification withCompletionHandler:(void (^)(NSUInteger options))completionHandler;
-- (void)userNotificationCenter:(id)center didReceiveNotificationResponse:(id)response withCompletionHandler:(void (^)())completionHandler;
+- (void)userNotificationCenter:(id)center willPresentNotification:(id)notification withCompletionHandler:(void (^)(NSUInteger options))completionHandler __deprecated_msg("Can use your own delegate as normal.");
+- (void)userNotificationCenter:(id)center didReceiveNotificationResponse:(id)response withCompletionHandler:(void (^)())completionHandler __deprecated_msg("Can use your own delegate as normal.");
 @end
 
 #endif
@@ -148,6 +148,9 @@ typedef OSNotificationDisplayType OSInFocusDisplayOption;
  Set to false when app is in focus and in-app alerts are disabled, or the remote notification is silent. */
 @property(readonly, getter=wasShown)BOOL shown;
 
+/* Set to true if the app was in focus when the notification  */
+@property(readonly, getter=wasAppInFocus)BOOL isAppInFocus;
+
 /* Set to true when the received notification is silent
  Silent means there is no alert, sound, or badge payload in the aps dictionary
  requires remote-notification within UIBackgroundModes array of the Info.plist */
@@ -233,7 +236,7 @@ typedef NS_ENUM(NSUInteger, ONE_S_LOG_LEVEL) {
 + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId;
 + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId handleNotificationAction:(OSHandleNotificationActionBlock)actionCallback;
 + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId handleNotificationAction:(OSHandleNotificationActionBlock)actionCallback settings:(NSDictionary*)settings;
-+ (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId handleNotificationReceived:(OSHandleNotificationReceivedBlock)receivedCallback handleNotificationAction:(OSHandleNotificationActionBlock)actionCallback settings:(NSDictionary*)settings;
++ (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId handleNotificationReceived:(OSHandleNotificationReceivedBlock)erceivedCallback handleNotificationAction:(OSHandleNotificationActionBlock)actionCallback settings:(NSDictionary*)settings;
 
 + (NSString*)app_id;
 
@@ -276,10 +279,10 @@ typedef NS_ENUM(NSUInteger, ONE_S_LOG_LEVEL) {
 // Optional method that sends us the user's email as an anonymized hash so that we can better target and personalize notifications sent to that user across their devices.
 + (void)syncHashedEmail:(NSString*)email;
 
-// - iOS 10 BETA features currently only available on XCode 8 & iOS 10.0+
+// - iOS 10 features currently only available on XCode 8 & iOS 10.0+
 #if XC8_AVAILABLE
-+ (void)setNotificationCenterDelegate:(id<OSUserNotificationCenterDelegate>)delegate;
-+ (id<OSUserNotificationCenterDelegate>)notificationCenterDelegate;
++ (void)setNotificationCenterDelegate:(id<OSUserNotificationCenterDelegate>)delegate __deprecated_msg("Can use your own delegate as normal.");
++ (id<OSUserNotificationCenterDelegate>)notificationCenterDelegate __deprecated_msg("Can use your own delegate as normal.");
 #endif
 
 @end

Unity4.7OneSignalExample/Assets/Plugins/iOS/OneSignal.h

@@ -54,8 +54,8 @@
 
 @protocol OSUserNotificationCenterDelegate <NSObject>
 @optional
-- (void)userNotificationCenter:(id)center willPresentNotification:(id)notification withCompletionHandler:(void (^)(NSUInteger options))completionHandler;
-- (void)userNotificationCenter:(id)center didReceiveNotificationResponse:(id)response withCompletionHandler:(void (^)())completionHandler;
+- (void)userNotificationCenter:(id)center willPresentNotification:(id)notification withCompletionHandler:(void (^)(NSUInteger options))completionHandler __deprecated_msg("Can use your own delegate as normal.");
+- (void)userNotificationCenter:(id)center didReceiveNotificationResponse:(id)response withCompletionHandler:(void (^)())completionHandler __deprecated_msg("Can use your own delegate as normal.");
 @end
 
 #endif
@@ -148,6 +148,9 @@ typedef OSNotificationDisplayType OSInFocusDisplayOption;
  Set to false when app is in focus and in-app alerts are disabled, or the remote notification is silent. */
 @property(readonly, getter=wasShown)BOOL shown;
 
+/* Set to true if the app was in focus when the notification  */
+@property(readonly, getter=wasAppInFocus)BOOL isAppInFocus;
+
 /* Set to true when the received notification is silent
  Silent means there is no alert, sound, or badge payload in the aps dictionary
  requires remote-notification within UIBackgroundModes array of the Info.plist */
@@ -233,7 +236,7 @@ typedef NS_ENUM(NSUInteger, ONE_S_LOG_LEVEL) {
 + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId;
 + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId handleNotificationAction:(OSHandleNotificationActionBlock)actionCallback;
 + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId handleNotificationAction:(OSHandleNotificationActionBlock)actionCallback settings:(NSDictionary*)settings;
-+ (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId handleNotificationReceived:(OSHandleNotificationReceivedBlock)receivedCallback handleNotificationAction:(OSHandleNotificationActionBlock)actionCallback settings:(NSDictionary*)settings;
++ (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId handleNotificationReceived:(OSHandleNotificationReceivedBlock)erceivedCallback handleNotificationAction:(OSHandleNotificationActionBlock)actionCallback settings:(NSDictionary*)settings;
 
 + (NSString*)app_id;
 
@@ -276,10 +279,10 @@ typedef NS_ENUM(NSUInteger, ONE_S_LOG_LEVEL) {
 // Optional method that sends us the user's email as an anonymized hash so that we can better target and personalize notifications sent to that user across their devices.
 + (void)syncHashedEmail:(NSString*)email;
 
-// - iOS 10 BETA features currently only available on XCode 8 & iOS 10.0+
+// - iOS 10 features currently only available on XCode 8 & iOS 10.0+
 #if XC8_AVAILABLE
-+ (void)setNotificationCenterDelegate:(id<OSUserNotificationCenterDelegate>)delegate;
-+ (id<OSUserNotificationCenterDelegate>)notificationCenterDelegate;
++ (void)setNotificationCenterDelegate:(id<OSUserNotificationCenterDelegate>)delegate __deprecated_msg("Can use your own delegate as normal.");
++ (id<OSUserNotificationCenterDelegate>)notificationCenterDelegate __deprecated_msg("Can use your own delegate as normal.");
 #endif
 
 @end

Unity4.7OneSignalExample/Assets/Plugins/iOS/libOneSignal.a

@@ -1 +1 @@
-2.1.0
+2.1.1

Unity4.7OneSignalSDK.unitypackage

@@ -422,9 +422,14 @@ private void onPushNotificationOpened(string jsonString) {
          Dictionary<string, object> jsonObject = Json.Deserialize(jsonString) as Dictionary<string, object>;
 
          OSNotificationAction action = new OSNotificationAction();
-         if (jsonObject.ContainsKey("actionID")) action.actionID = jsonObject["actionID"] as string;
-         if (jsonObject.ContainsKey("type"))
-            action.type = (OSNotificationAction.ActionType)Convert.ToInt32(jsonObject["type"]);
+         if (jsonObject.ContainsKey("action")) {
+            Dictionary<string, object> actionJsonObject = jsonObject["action"] as Dictionary<string, object>;
+            
+            if (actionJsonObject.ContainsKey("actionID"))
+               action.actionID = actionJsonObject["actionID"] as string;
+            if (actionJsonObject.ContainsKey("type"))
+               action.type = (OSNotificationAction.ActionType)Convert.ToInt32(actionJsonObject["type"]);
+         }
 
          OSNotificationOpenedResult result = new OSNotificationOpenedResult();
          result.notification = DictionaryToNotification((Dictionary<string, object>)jsonObject["notification"]);