Skip to content

Pbe 4247 fix network monitor #153

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.

Sign up for GitHub

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

Merged
sierpinskid merged 2 commits into from
Jun 21, 2024
Merged

Pbe 4247 fix network monitor #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5729b42
Fix network monitor not raising any events
sierpinskid Jun 20, 2024
094fe2f
remove redundant NetworkReachability from the example project - SDK n…
sierpinskid Jun 20, 2024
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
2 changes: 2 additions & 0 deletions Assets/Plugins/StreamChat/Core/LowLevelClient/ReconnectScheduler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ public void Dispose()
_client.Reconnecting -= OnReconnecting;
_client.ConnectionStateChanged -= OnConnectionStateChanged;
}

_networkMonitor.NetworkAvailabilityChanged -= OnNetworkAvailabilityChanged;
}

public void SetReconnectStrategySettings(ReconnectStrategy reconnectStrategy, float? exponentialMinInterval,
Expand Down
2 changes: 2 additions & 0 deletions Assets/Plugins/StreamChat/Core/LowLevelClient/StreamChatLowLevelClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@ public async Task DisconnectAsync(bool permanent = false)

public void Update(float deltaTime)
{
_networkMonitor?.Update();

#if !STREAM_TESTS_ENABLED
_updateCallReceived = true;
#endif
Expand Down
2 changes: 1 addition & 1 deletion Assets/Plugins/StreamChat/Libs/NetworkMonitors/UnityNetworkMonitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void Update()
return;
}

var wasReachable = IsReachable(_lastState.Value);
var wasReachable = IsReachable(prevLastState.Value);

if (wasReachable && !isReachable)
{
Expand Down
21 changes: 0 additions & 21 deletions Assets/Plugins/StreamChat/SampleProject/Scripts/StreamChatClientBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,27 +80,6 @@ protected void Awake()
}
}

protected void Update()
{
if (_client == null || _missingCredentials)
{
return;
}

var isClientConnectedOrConnecting = _client.ConnectionState == ConnectionState.Connected ||
_client.ConnectionState == ConnectionState.Connecting;

var isNetworkReachable =
Application.internetReachability == NetworkReachability.ReachableViaCarrierDataNetwork ||
Application.internetReachability == NetworkReachability.ReachableViaLocalAreaNetwork;

if (!isClientConnectedOrConnecting && isNetworkReachable)
{
Debug.LogWarning("Client is not connected, but network is reachable. Force reconnect.");
_client.ConnectUserAsync(_authCredentialsAsset.Credentials);
}
}

private IStreamChatClient _client;
private bool _missingCredentials;

Expand Down