LobbyUIMediator relayjoinedfailed logic moved into internal scope

Author: pdeschain

Assets/BossRoom/Scripts/Client/UI/Lobby/LobbyUIMediator.cs

@@ -21,7 +21,6 @@ public class LobbyUIMediator : MonoBehaviour
         LobbyServiceFacade m_LobbyServiceFacade;
         LocalLobbyUser m_LocalUser;
         LocalLobby m_LocalLobby;
-        IPublisher<UnityServiceErrorMessage> m_UnityServiceErrorMessagePublisher;
         NameGenerationData m_NameGenerationData;
         GameNetPortal m_GameNetPortal;
         ClientGameNetPortal m_ClientNetPortal;
@@ -40,7 +39,6 @@ ClientGameNetPortal clientGameNetPortal
             m_NameGenerationData = nameGenerationData;
             m_LocalUser = localUser;
             m_LobbyServiceFacade = lobbyServiceFacade;
-            m_UnityServiceErrorMessagePublisher = unityServiceErrorMessagePublisher;
             m_LocalLobby = localLobby;
             m_GameNetPortal = gameNetPortal;
             m_ClientNetPortal = clientGameNetPortal;
@@ -156,16 +154,14 @@ void OnJoinedLobby(Lobby remoteLobby)
                     m_ClientNetPortal.StartClientUnityRelayModeAsync(m_LocalLobby.RelayJoinCode, OnRelayJoinFailed);
                     break;
             }
-        }
-
-        void OnRelayJoinFailed(string message)
-        {
-            Debug.Log($"Relay join failed: {message}");
-            //leave the lobby if relay failed for some reason
-            m_LobbyServiceFacade.EndTracking();
 
-            UnblockUIAfterLoadingIsComplete();
-            m_UnityServiceErrorMessagePublisher.Publish(new UnityServiceErrorMessage("Unity Relay: Join Failed", message));
+            void OnRelayJoinFailed(string message)
+            {
+                Debug.Log($"Relay join failed: {message}");
+                //leave the lobby if relay failed for some reason
+                m_LobbyServiceFacade.EndTracking();
+                UnblockUIAfterLoadingIsComplete();
+            }
         }
 
         //show/hide UI
@@ -237,7 +233,6 @@ void OnConnectFinished(ConnectStatus status)
         void OnNetworkTimeout()
         {
             UnblockUIAfterLoadingIsComplete();
-            m_UnityServiceErrorMessagePublisher.Publish(new UnityServiceErrorMessage("Connection failed", "Unable to Reach Host/Server"));
         }
 
         /// <summary>

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ClientGameNetPortal.cs

@@ -1,5 +1,6 @@
 using System;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
+using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Infrastructure;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies;
 using UnityEngine;
 using UnityEngine.SceneManagement;

Assets/BossRoom/Scripts/Shared/Net/UnityServices/Lobbies/LobbyServiceFacade.cs

@@ -22,11 +22,10 @@ public class LobbyServiceFacade : IDisposable
         readonly ApplicationController m_ApplicationController;
 
         const float k_HeartbeatPeriod = 8; // The heartbeat must be rate-limited to 5 calls per 30 seconds. We'll aim for longer in case periods don't align.
+        float m_HeartbeatTime = 0;
 
         DIScope m_ServiceScope;
 
-        float m_HeartbeatTime = 0;
-
         RateLimitCooldown m_RateLimitQuery;
         RateLimitCooldown m_RateLimitJoin;
         RateLimitCooldown m_RateLimitQuickJoin;
@@ -45,7 +44,6 @@ public LobbyServiceFacade(
             IPublisher<UnityServiceErrorMessage> serviceErrorMessagePub,
             IPublisher<LobbyListFetchedMessage> lobbyListFetchedPub)
         {
-
             m_ApplicationController = applicationController;
             m_UpdateRunner = updateRunner;
             m_LocalLobby = localLobby;
@@ -194,7 +192,6 @@ public void QuickJoinLobbyAsync(Action<Lobby> onSuccess, Action onFailure)
             }
 
             m_RateLimitQuickJoin.PutOnCooldown();
-
             m_LobbyApiInterface.QuickJoinLobbyAsync(AuthenticationService.Instance.PlayerId, m_LocalUser.GetDataForUnityServices(), onSuccess, onFailure);
         }