Merge branch 'develop' of https://github.com/GetStream/stream-chat-unity into develop

# Conflicts:
#	Assets/Plugins/StreamChat/Tests/StatefulClient/BaseStateIntegrationTests.cs

Author: sierpinskid

Assets/Plugins/StreamChat/Changelog.txt

@@ -1,3 +1,13 @@
+v4.7.0:
+Fixes:
+* Fix the IStreamChannel  instance provided by an event not triggering its own events (the channel was not being watched if it was only returned via event) 
+* Fix client events:  IStreamChatClient.AddedToChannelAsMember,  IStreamChatClient.RemovedFromChannelAsMember,  IStreamChatClient.ChannelInviteReceived, IStreamChatClient.ChannelInviteAccepted, IStreamChatClient.ChannelInviteRejected not being executed on the main thread 
+* Fix the client not reconnecting immediately after losing network connection when the network is available again 
+* Fix internal WebSocket client sometimes getting stuck in the Connecting state on Android when the network was not available 
+
+Features:
+* Add state recovery after the disconnected period - once the client reconnects, it will fetch any missed events (like new messages, etc.) from the server and reconstruct the missed state
+
 v4.6.0:
 Improvements:
 * Added client events that are fired when the local user is added to a new channel -> IStreamChatClient.AddedToChannelAsMember or removed from a channel IStreamChatClient.RemovedFromChannelAsMember - These two events fire only for channels that are not tracked locally. For tracked channels, the IStreamChannel.MemberAdded & IStreamChannel.MemberRemoved should be used

Assets/Plugins/StreamChat/Core/Exceptions/StreamDeserializationException.cs

@@ -11,10 +11,16 @@ public class StreamDeserializationException : Exception
         public Type TargetType { get; }
 
         public StreamDeserializationException(string content, Type targetType, Exception innerException)
-            : base($"Failed to deserialize string to type: `{targetType.Name}` ", innerException)
+            : base($"Failed to deserialize string to type: `{targetType.Name}`", innerException)
         {
             TargetType = targetType;
             Content = content;
         }
+        
+        public override string ToString()
+        {
+            var innerExceptionMessage = InnerException != null ? InnerException.ToString() : string.Empty;
+            return $"Failed to deserialize string to type: `{TargetType.Name}`\nContent: {Content}\nInnerException: {innerExceptionMessage}";
+        }
     }
 }

Assets/Plugins/StreamChat/Core/InternalDTO/Responses/SyncResponseInternalDTO.cs

@@ -23,7 +23,7 @@ internal partial class SyncResponseInternalDTO
         /// List of events
         /// </summary>
         [Newtonsoft.Json.JsonProperty("events", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
-        public System.Collections.Generic.List<EventInternalDTO> Events { get; set; } = new System.Collections.Generic.List<EventInternalDTO>();
+        public System.Collections.Generic.List<object> Events { get; set; } = new System.Collections.Generic.List<object>();
 
         /// <summary>
         /// List of CIDs that user can't access

Assets/Plugins/StreamChat/Core/LowLevelClient/API/ChannelApi.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using StreamChat.Core.Helpers;
+using StreamChat.Core.InternalDTO.Requests;
 using StreamChat.Core.InternalDTO.Responses;
 using StreamChat.Core.LowLevelClient.API.Internal;
 using StreamChat.Core.LowLevelClient.Models;
@@ -141,6 +142,12 @@ public Task SendTypingStartEventAsync(string channelType, string channelId)
         public Task SendTypingStopEventAsync(string channelType, string channelId)
             => _internalChannelApi.SendTypingStopEventAsync(channelType, channelId);
 
+        public async Task<SyncResponse> SyncAsync(SyncRequest syncRequest)
+        {
+            var dto = await _internalChannelApi.SyncAsync(syncRequest.TrySaveToDto());
+            return dto.ToDomain<SyncResponseInternalDTO, SyncResponse>();
+        }
+
         private readonly IInternalChannelApi _internalChannelApi;
     }
 }

Assets/Plugins/StreamChat/Core/LowLevelClient/API/IChannelApi.cs

@@ -150,5 +150,8 @@ Task<MarkReadResponse> MarkReadAsync(string channelType, string channelId,
         Task SendTypingStartEventAsync(string channelType, string channelId);
 
         Task SendTypingStopEventAsync(string channelType, string channelId);
+
+        //StreamTodo: perhaps we can skip this declaration and use the Internal one directly
+        Task<SyncResponse> SyncAsync(SyncRequest syncRequest); 
     }
 }

Assets/Plugins/StreamChat/Core/LowLevelClient/API/Internal/IInternalChannelApi.cs

@@ -52,5 +52,7 @@ Task<MarkReadResponseInternalDTO> MarkReadAsync(string channelType, string chann
         Task SendTypingStartEventAsync(string channelType, string channelId);
 
         Task SendTypingStopEventAsync(string channelType, string channelId);
+
+        Task<SyncResponseInternalDTO> SyncAsync(SyncRequestInternalDTO syncRequest);
     }
 }

Assets/Plugins/StreamChat/Core/LowLevelClient/API/Internal/InternalChannelApi.cs

@@ -133,5 +133,8 @@ public Task SendTypingStopEventAsync(string channelType, string channelId)
             {
                 Type = WSEventType.TypingStop
             });
+
+        public Task<SyncResponseInternalDTO> SyncAsync(SyncRequestInternalDTO syncRequest)
+            => Post<SyncRequestInternalDTO, SyncResponseInternalDTO>($"/sync", syncRequest);
     }
 }

Assets/Plugins/StreamChat/Core/LowLevelClient/API/Internal/InternalMessageApi.cs

@@ -1,5 +1,4 @@
-using System.Net.Http;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using StreamChat.Core.InternalDTO.Requests;
 using StreamChat.Core.InternalDTO.Responses;
 using StreamChat.Core.Web;

Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventBase.cs

@@ -2,6 +2,8 @@ namespace StreamChat.Core.LowLevelClient.Events
 {
     public abstract class EventBase
     {
+        public System.DateTimeOffset CreatedAt { get; set; }
+
         private System.Collections.Generic.Dictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
 
         [Newtonsoft.Json.JsonExtensionData]

Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventChannelDeleted.cs

@@ -15,8 +15,6 @@ public sealed class EventChannelDeleted : EventBase,
 
         public string Cid { get; set; }
 
-        public System.DateTimeOffset? CreatedAt { get; set; }
-
         public string Team { get; set; }
 
         public string Type { get; set; }