Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified PubNubUnity/Assets/PubNub/Runtime/Plugins/PubnubApiUnity.dll
Binary file not shown.
33 changes: 33 additions & 0 deletions PubNubUnity/Assets/PubNub/Runtime/Plugins/PubnubApiUnity.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions PubNubUnity/Assets/PubNub/Runtime/Util/NewtonsoftJsonUnity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public object DeserializeToObject(object rawObject, Type type)
{
try
{
logger?.Debug("JsonNet Deserializing object data.");
logger?.Trace("JsonNet Deserializing object data.");
if (rawObject is JObject jObject)
{
return jObject.ToObject(type);
Expand All @@ -159,7 +159,7 @@ public object DeserializeToObject(object rawObject, Type type)

public object DeserializeToObject(string jsonString)
{
logger?.Debug("JsonNet Deserializing json string data.");
logger?.Trace("JsonNet Deserializing json string data.");
object result = JsonConvert.DeserializeObject<object>(jsonString,
new JsonSerializerSettings { DateParseHandling = DateParseHandling.None, MaxDepth = 64 });
if (result.GetType().ToString() == "Newtonsoft.Json.Linq.JArray")
Expand All @@ -180,7 +180,7 @@ public object DeserializeToObject(string jsonString)
result = objectContainer;
}
}
logger?.Debug("JsonNet Deserialsed json string data successfully.");
logger?.Trace("JsonNet Deserialsed json string data successfully.");
return result;
}

Expand Down Expand Up @@ -215,7 +215,7 @@ private bool IsGenericTypeForMessage<T>()

private T DeserializeMessageToObjectBasedOnPlatform<T>(List<object> listObject)
{
logger?.Debug("JsonNet Deserializing Messages data.");
logger?.Trace("JsonNet Deserializing Messages data.");
T ret = default(T);
Type dataType = typeof(T).GetTypeInfo().GenericTypeArguments[0];
Type generic = typeof(PNMessageResult<>);
Expand Down Expand Up @@ -290,7 +290,7 @@ private T DeserializeMessageToObjectBasedOnPlatform<T>(List<object> listObject)

ret = (T)Convert.ChangeType(message, specific, CultureInfo.InvariantCulture);
}
logger?.Debug("JsonNet Deserialized Messages successfully.");
logger?.Trace("JsonNet Deserialized Messages successfully.");
return ret;
}

Expand Down
Loading