diff --git a/.pubnub.yml b/.pubnub.yml index 48f91eed7..926da586e 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,13 @@ name: c-sharp -version: "6.19.4" +version: "6.19.5" schema: 1 scm: github.com/pubnub/c-sharp changelog: + - date: 2024-01-17 + version: v6.19.5 + changes: + - type: bug + text: "Fixes issue of getting exception for custom objects in subscription and history when crypto module is configured." - date: 2023-11-28 version: v6.19.4 changes: @@ -761,7 +766,7 @@ features: - QUERY-PARAM supported-platforms: - - version: Pubnub 'C#' 6.19.4 + version: Pubnub 'C#' 6.19.5 platforms: - Windows 10 and up - Windows Server 2008 and up @@ -771,7 +776,7 @@ supported-platforms: - .Net Framework 4.5 - .Net Framework 4.6.1+ - - version: PubnubPCL 'C#' 6.19.4 + version: PubnubPCL 'C#' 6.19.5 platforms: - Xamarin.Android - Xamarin.iOS @@ -791,7 +796,7 @@ supported-platforms: - .Net Core - .Net 6.0 - - version: PubnubUWP 'C#' 6.19.4 + version: PubnubUWP 'C#' 6.19.5 platforms: - Windows Phone 10 - Universal Windows Apps @@ -815,7 +820,7 @@ sdks: distribution-type: source distribution-repository: GitHub package-name: Pubnub - location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.4.0 + location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.5.0 requires: - name: ".Net" @@ -1098,7 +1103,7 @@ sdks: distribution-type: source distribution-repository: GitHub package-name: PubNubPCL - location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.4.0 + location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.5.0 requires: - name: ".Net Core" @@ -1457,7 +1462,7 @@ sdks: distribution-type: source distribution-repository: GitHub package-name: PubnubUWP - location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.4.0 + location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.5.0 requires: - name: "Universal Windows Platform Development" diff --git a/CHANGELOG b/CHANGELOG index bbd9e2b31..fab3ca573 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +v6.19.5 - January 17 2024 +----------------------------- +- Fixed: fixes issue of getting exception for custom objects in subscription and history when crypto module is configured. + v6.19.4 - November 28 2023 ----------------------------- - Fixed: handle unencrypted message while getting messages with crypto. diff --git a/src/Api/PubnubApi/Properties/AssemblyInfo.cs b/src/Api/PubnubApi/Properties/AssemblyInfo.cs index c1729a64a..d81275ae0 100644 --- a/src/Api/PubnubApi/Properties/AssemblyInfo.cs +++ b/src/Api/PubnubApi/Properties/AssemblyInfo.cs @@ -11,8 +11,8 @@ [assembly: AssemblyProduct("Pubnub C# SDK")] [assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("6.19.4.0")] -[assembly: AssemblyFileVersion("6.19.4.0")] +[assembly: AssemblyVersion("6.19.5.0")] +[assembly: AssemblyFileVersion("6.19.5.0")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. diff --git a/src/Api/PubnubApi/PubnubApi.csproj b/src/Api/PubnubApi/PubnubApi.csproj index 97fe7984b..ce225a246 100644 --- a/src/Api/PubnubApi/PubnubApi.csproj +++ b/src/Api/PubnubApi/PubnubApi.csproj @@ -14,7 +14,7 @@ Pubnub - 6.19.4.0 + 6.19.5.0 PubNub C# .NET - Web Data Push API Pandu Masabathula PubNub @@ -22,7 +22,7 @@ http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png true https://github.com/pubnub/c-sharp/ - Handle unencrypted message while getting messages with crypto. + Fixes issue of getting exception for custom objects in subscription and history when crypto module is configured. Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously diff --git a/src/Api/PubnubApi/PubnubCoreBase.cs b/src/Api/PubnubApi/PubnubCoreBase.cs index 25643fb06..df4f6ca6f 100644 --- a/src/Api/PubnubApi/PubnubCoreBase.cs +++ b/src/Api/PubnubApi/PubnubCoreBase.cs @@ -736,8 +736,7 @@ private void ResponseToUserCallback(List result, PNOperationType type currentConfig.LogVerbosity ); } - object decodeMessage = jsonLib.DeserializeToObject((decryptMessage == "**DECRYPT ERROR**") ? payload.ToString() : decryptMessage); - + object decodeMessage = jsonLib.DeserializeToObject((decryptMessage == "**DECRYPT ERROR**") ? jsonLib.SerializeToJsonString(payload) : decryptMessage); payloadContainer.Add(decodeMessage); } else diff --git a/src/Api/PubnubApi/Security/SecureMessage.cs b/src/Api/PubnubApi/Security/SecureMessage.cs index d2e9265a1..2a15b2ed6 100644 --- a/src/Api/PubnubApi/Security/SecureMessage.cs +++ b/src/Api/PubnubApi/Security/SecureMessage.cs @@ -68,12 +68,10 @@ public List HistoryDecodeDecryptLoop(PNOperationType type, List FetchHistoryDecodeDecryptLoop(PNOperationType type, Dicti { status.AffectedChannelGroups.AddRange(channelGroups); } - - errorCallback.OnResponse(default(T), status); + pubnubLog.WriteToLog("Failed to decrypt message!\nMessage might be not encrypted, returning as is..."); #endregion } - pubnubLog.WriteToLog("Failed to decrypt message!\nMessage might be not encrypted, returning as is..."); - object decodeMessage = jsonLib.DeserializeToObject((decryptMessage == "**DECRYPT ERROR**") ? decryptMessage : decryptMessage); - dicDecrypt.Add(kvpValue.Key, decodeMessage); + object decodedMessage = jsonLib.DeserializeToObject((decryptMessage == "**DECRYPT ERROR**") ? jsonLib.SerializeToJsonString(kvpValue.Value) : decryptMessage); + dicDecrypt.Add(kvpValue.Key, decodedMessage); } else { diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj index 879fa6efa..79db825d7 100644 --- a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj +++ b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj @@ -15,7 +15,7 @@ PubnubPCL - 6.19.4.0 + 6.19.5.0 PubNub C# .NET - Web Data Push API Pandu Masabathula PubNub @@ -23,7 +23,7 @@ http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png true https://github.com/pubnub/c-sharp/ - Handle unencrypted message while getting messages with crypto. + Fixes issue of getting exception for custom objects in subscription and history when crypto module is configured. Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj index 2ebea91c7..62cf9ccfd 100644 --- a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj +++ b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj @@ -16,7 +16,7 @@ PubnubUWP - 6.19.4.0 + 6.19.5.0 PubNub C# .NET - Web Data Push API Pandu Masabathula PubNub @@ -24,7 +24,7 @@ http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png true https://github.com/pubnub/c-sharp/ - Handle unencrypted message while getting messages with crypto. + Fixes issue of getting exception for custom objects in subscription and history when crypto module is configured. Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously diff --git a/src/Api/PubnubApiUnity/PubnubApiUnity.csproj b/src/Api/PubnubApiUnity/PubnubApiUnity.csproj index a368be819..cdbb0611f 100644 --- a/src/Api/PubnubApiUnity/PubnubApiUnity.csproj +++ b/src/Api/PubnubApiUnity/PubnubApiUnity.csproj @@ -15,7 +15,7 @@ PubnubApiUnity - 6.19.4.0 + 6.19.5.0 PubNub C# .NET - Web Data Push API Pandu Masabathula PubNub