making sure we remove loading screen on timeout

Author: SamuelBellomo

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

@@ -29,6 +29,7 @@ public class LobbyUIMediator : MonoBehaviour
         NameGenerationData m_NameGenerationData;
         GameNetPortal m_GameNetPortal;
         ClientGameNetPortal m_ClientNetPortal;
+        IDisposable m_Subscriptions;
 
         const string k_DefaultLobbyName = "no-name";
 
@@ -39,6 +40,7 @@ void InjectDependenciesAndInitialize(
             LocalLobby localLobby,
             NameGenerationData nameGenerationData,
             GameNetPortal gameNetPortal,
+            ISubscriber<ConnectStatus> connectStatusSub,
             ClientGameNetPortal clientGameNetPortal
         )
         {
@@ -51,17 +53,22 @@ ClientGameNetPortal clientGameNetPortal
 
             RegenerateName();
 
-            m_ClientNetPortal.NetworkTimedOut += OnNetworkTimeout;
+            m_Subscriptions = connectStatusSub.Subscribe(OnConnectStatus);
         }
 
-        void OnDestroy()
+        void OnConnectStatus(ConnectStatus status)
         {
-            if (m_ClientNetPortal != null)
+            if (status == ConnectStatus.GenericDisconnect)
             {
-                m_ClientNetPortal.NetworkTimedOut -= OnNetworkTimeout;
+                UnblockUIAfterLoadingIsComplete();
             }
         }
 
+        void OnDestroy()
+        {
+            m_Subscriptions.Dispose();
+        }
+
         //Lobby and Relay calls done from UI
 
         public void CreateLobbyRequest(string lobbyName, bool isPrivate, int maxPlayers, OnlineMode onlineMode)
@@ -236,15 +243,5 @@ void UnblockUIAfterLoadingIsComplete()
                 m_LoadingSpinner.SetActive(false);
             }
         }
-
-        /// <summary>
-        /// Invoked when the client sent a connection request to the server and didn't hear back at all.
-        /// This should create a UI letting the player know that something went wrong and to try again
-        /// </summary>
-        void OnNetworkTimeout()
-        {
-            m_LobbyServiceFacade.EndTracking();
-            UnblockUIAfterLoadingIsComplete();
-        }
     }
 }

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

@@ -35,12 +35,6 @@ public class ClientGameNetPortal : MonoBehaviour
         private const int k_TimeoutDuration = 10;
         const int k_NbReconnectAttempts = 1;
 
-        /// <summary>
-        /// This event fires when the client sent out a request to start the client, but failed to hear back after an allotted amount of
-        /// time from the host.
-        /// </summary>
-        public event Action NetworkTimedOut;
-
         ApplicationController m_ApplicationController;
         LobbyServiceFacade m_LobbyServiceFacade;
         IPublisher<ConnectStatus> m_ConnectStatusPub;