Update version.

README.md

@@ -3,8 +3,8 @@ OPFPush Unity Plugin
 
 Unity plugin for [OPFPush](https://github.com/onepf/OPFPush) library.
 Currently it supports only android push messages.
-[opfpush-all.unitypackage](https://github.com/onepf/OPFPush-Unity-Plugin/releases/download/v0.3.1.1/opfpush-all-0.3.1.1.unitypackage) contains all supported push providers (GCM, ADM and Nokia Push)
-[opfpush-gcm-adm.unitypackage](https://github.com/onepf/OPFPush-Unity-Plugin/releases/download/v0.3.1.1/opfpush-gcm-adm-0.3.1.1.unitypackage) doesn't contain Nokia Push provider.
+[opfpush-all.unitypackage](https://github.com/onepf/OPFPush-Unity-Plugin/releases/download/v0.3.1.2/opfpush-all-0.3.1.2.unitypackage) contains all supported push providers (GCM, ADM and Nokia Push)
+[opfpush-gcm-adm.unitypackage](https://github.com/onepf/OPFPush-Unity-Plugin/releases/download/v0.3.1.2/opfpush-gcm-adm-0.3.1.2.unitypackage) doesn't contain Nokia Push provider.
 
 The latest unity packages avaliable [here](https://github.com/onepf/OPFPush-Unity-Plugin/releases)
 

gradle.properties

@@ -32,4 +32,4 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=0.3.1.1
+VERSION_NAME=0.3.1.2

opfpush-unity/unity/Assets/Plugins/OPFPush/EventReceiver.cs

@@ -1,7 +1,7 @@
 using UnityEngine;
 using System.Collections.Generic;
 using System;
-using Newtonsoft.Json;
+using SimpleJSON;
 
 namespace OnePF.OPFPush
 {
@@ -19,7 +19,14 @@ void OnMessage (string messageJson)
 		{
 			Debug.Log ("OPFPush. Receive OnMessage event. json : " + messageJson);
 			if (OnMessageAction != null) {
-				var data = JsonConvert.DeserializeObject<OnMessageData> (messageJson);
+				var rawData = JSON.Parse (messageJson);			
+				var dataDictionary = new Dictionary<string, string> ();
+				foreach (var key in rawData["data"].AsObject.GetKeys ()) 
+				{
+					dataDictionary.Add (key.ToString(), rawData["data"][key.ToString()]);
+				}
+
+				var data = new OnMessageData (rawData["providerName"].Value, dataDictionary);
 				OnMessageAction (data.ProviderName, data.Data);
 			} else
 				Debug.Log ("OPFPush. OnMessageAction == null");
@@ -29,7 +36,8 @@ void OnDeletedMessages (string deletedMessagesJson)
 		{
 			Debug.Log ("OPFPush. Receive OnDeletedMessages event. json : " + deletedMessagesJson);
 			if (OnDeletedMessageAction != null) {
-				var data = JsonConvert.DeserializeObject<OnDeletedMessagesData> (deletedMessagesJson);
+				var rawData = JSON.Parse (deletedMessagesJson);
+				var data = new OnDeletedMessagesData (rawData["providerName"].Value, rawData["messagesCount"].AsInt);
 				OnDeletedMessageAction (data.ProviderName, data.MessagesCount);
 			} else
 				Debug.Log ("OPFPush. OnDeletedMessageAction == null");
@@ -39,7 +47,8 @@ void OnRegistered (string registeredJson)
 		{
 			Debug.Log ("OPFPush. Receive OnRegistered event. json : " + registeredJson);
 			if (OnRegisteredAction != null) {
-				var data = JsonConvert.DeserializeObject<OnRegisteredData> (registeredJson);
+				var rawData = JSON.Parse (registeredJson);
+				var data = new OnRegisteredData (rawData["providerName"].Value, rawData["registrationId"].Value);
 				OnRegisteredAction (data.ProviderName, data.RegistrationId);
 			} else 
 				Debug.Log ("OPFPush. OnRegisteredAction == null");
@@ -49,7 +58,8 @@ void OnUnregistered (string unregisteredJson)
 		{
 			Debug.Log ("OPFPush. Receive OnUnregistered event. json : " + unregisteredJson);
 			if (OnUnregisteredAction != null) {
-				var data = JsonConvert.DeserializeObject<OnUnregisteredData> (unregisteredJson);
+				var rawData = JSON.Parse (unregisteredJson);
+				var data = new OnUnregisteredData (rawData["providerName"].Value, rawData["oldRegistrationId"].Value);
 				OnUnregisteredAction (data.ProviderName, data.OldRegistrationId);
 			} else
 				Debug.Log ("OPFPush. OnUnregisteredAction == null");
@@ -59,8 +69,15 @@ void OnNoAvailableProvider (string noAvailableProviderJson)
 		{
 			Debug.Log ("OPFPush. Receive OnNoAvailableProvider event. json : " + noAvailableProviderJson);
 			if (OnNoAvailableProviderActon != null) {
-				var data = JsonConvert.DeserializeObject<OnNoAvailableProviderData> (noAvailableProviderJson);
-				OnNoAvailableProviderActon (data.PushErrors);
+				var rawData = JSON.Parse (noAvailableProviderJson);				
+				var dataDictionary = new Dictionary<string, PushError> ();
+				var rawPushErrorsArray = rawData["pushErrors"];
+				foreach (var key in rawPushErrorsArray.AsObject.GetKeys ()) 
+				{
+					var rawPushError = rawPushErrorsArray[key.ToString()];
+					dataDictionary.Add (key.ToString(), new PushError(rawPushError["availabilityErrorCode"].Value, rawPushError["type"].Value, rawPushError["originalError"].Value));
+				}
+				OnNoAvailableProviderActon (dataDictionary);
 			} else 
 				Debug.Log ("OPFPush. OnNoAvailableProviderActon == null");
 		}

opfpush-unity/unity/Assets/Plugins/OPFPush/Model/OnDeletedMessagesData.cs

@@ -5,5 +5,10 @@ public class OnDeletedMessagesData
 		public string ProviderName { get; set; }
 
 		public int MessagesCount { get; set; }
+
+		public OnDeletedMessagesData(string providerName, int messagesCount) {
+			this.ProviderName = providerName;
+			this.MessagesCount = messagesCount;
+		}
 	}
 }

opfpush-unity/unity/Assets/Plugins/OPFPush/Model/OnMessageData.cs

@@ -7,5 +7,10 @@ public class OnMessageData
 		public string ProviderName { get; set; }
 
 		public Dictionary<string, string> Data { get; set; }
+
+		public OnMessageData(string providerName, Dictionary<string, string> data) {
+			this.ProviderName = providerName;
+			this.Data = data;
+		}
 	}	
 }

opfpush-unity/unity/Assets/Plugins/OPFPush/Model/OnRegisteredData.cs

@@ -5,5 +5,10 @@ public class OnRegisteredData
 		public string ProviderName { get; set; }
 
 		public string RegistrationId { get; set; }
+
+		public OnRegisteredData(string providerName, string registrationId) {
+			this.ProviderName = providerName;
+			this.RegistrationId = registrationId;
+		}
 	}
 }

opfpush-unity/unity/Assets/Plugins/OPFPush/Model/OnUnregisteredData.cs

@@ -5,5 +5,10 @@ public class OnUnregisteredData
 		public string ProviderName { get; set; }
 
 		public string OldRegistrationId { get; set; }
+
+		public OnUnregisteredData(string providerName, string oldRegistrationId) {
+			this.ProviderName = providerName;
+			this.OldRegistrationId = oldRegistrationId;
+		}
 	}
 }

opfpush-unity/unity/Assets/Plugins/OPFPush/Model/PushError.cs

@@ -7,5 +7,11 @@ public class PushError
 		public string Type { get; set; }
 
 		public string OriginalError { get; set; }
+
+		public PushError(string availabilityErrorCode, string type, string originalError) {
+			this.AvailabilityErrorCode = availabilityErrorCode;
+			this.Type = type;
+			this.OriginalError = originalError;
+		}
 	}
 }