-
Notifications
You must be signed in to change notification settings - Fork 126
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix for hard-coded nu-get Newtonsoft usage in C# SDK causing Unity IL2CPP builds to crash #219
Merged
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a602c69
fix: expose way to deserialize to internal object from external IJson…
jakub-grzesiowski 250221a
Remove direct Newtonsoft usage from EmitMessagesHandler
jakub-grzesiowski 7a9ae4d
fix incorrect log usage
jakub-grzesiowski 8463513
fix: handling error status in subscribe
mohitpubnub 43cc91d
PubNub SDK v6.20.1.0 release.
pubnub-release-bot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,8 +2,6 @@ | |
using System.Collections.Generic; | ||
using System.Linq; | ||
using System.Threading.Tasks; | ||
using Newtonsoft.Json; | ||
using Newtonsoft.Json.Linq; | ||
using PubnubApi.EventEngine.Common; | ||
using PubnubApi.EventEngine.Core; | ||
using PubnubApi.EventEngine.Subscribe.Invocations; | ||
|
@@ -14,18 +12,18 @@ public class EmitMessagesHandler : EffectHandler<EmitMessagesInvocation> | |
{ | ||
private readonly Dictionary<string, Type> channelTypeMap; | ||
private readonly Dictionary<string, Type> channelGroupTypeMap; | ||
private readonly JsonSerializer serializer; | ||
private readonly IJsonPluggableLibrary jsonPluggableLibrary; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍🏻 |
||
private readonly EventEmitter eventEmitter; | ||
|
||
public EmitMessagesHandler(EventEmitter eventEmitter, | ||
JsonSerializer serializer, | ||
IJsonPluggableLibrary jsonPluggableLibrary, | ||
Dictionary<string, Type> channelTypeMap = null, | ||
Dictionary<string, Type> channelGroupTypeMap = null) | ||
{ | ||
this.eventEmitter = eventEmitter; | ||
this.channelTypeMap = channelTypeMap; | ||
this.channelGroupTypeMap = channelGroupTypeMap; | ||
this.serializer = serializer; | ||
this.jsonPluggableLibrary = jsonPluggableLibrary; | ||
} | ||
|
||
public async override Task Run(EmitMessagesInvocation invocation) | ||
|
@@ -45,17 +43,14 @@ public async override Task Run(EmitMessagesInvocation invocation) | |
private object DeserializePayload(string key, object rawMessage) | ||
{ | ||
try { | ||
if (rawMessage is JObject message) { | ||
Type t; | ||
if ((channelTypeMap is not null && channelTypeMap.TryGetValue(key, out t) || | ||
channelGroupTypeMap is not null && channelGroupTypeMap.TryGetValue(key, out t)) && | ||
t != typeof(string)) { | ||
return message.ToObject(t, serializer); | ||
} else { | ||
return message.ToString(Formatting.None); | ||
} | ||
Type t; | ||
if ((channelTypeMap is not null && channelTypeMap.TryGetValue(key, out t) || | ||
channelGroupTypeMap is not null && channelGroupTypeMap.TryGetValue(key, out t)) && | ||
t != typeof(string)) | ||
{ | ||
return jsonPluggableLibrary.DeserializeToObject(rawMessage, t); | ||
} else { | ||
return rawMessage; | ||
return rawMessage.ToString(); | ||
} | ||
} catch (Exception) { | ||
return rawMessage; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍🏻