simplified cancellation callbacks

Author: fernando-cortez

Assets/BossRoom/Prefabs/UI/IPPopup.prefab

@@ -2901,6 +2901,19 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 5705220060289623588}
+        m_TargetAssemblyTypeName: Unity.Multiplayer.Samples.BossRoom.Visual.IPUIMediator,
+          Unity.Multiplayer.Samples.BossRoom.Client
+        m_MethodName: CancelConnectingWindow
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &5588059588747898398
 GameObject:
   m_ObjectHideFlags: 0

Assets/BossRoom/Scripts/Client/UI/IPConnectionWindow.cs

@@ -46,7 +46,7 @@ void OnTimeElapsed()
                 PopupManager.ShowPopupPanel("Connection Failed",
                     "Failed to connect to server and/or invalid network endpoint");
                 Hide();
-                m_IPUIMediator.ConnectingFinished();
+                m_IPUIMediator.DisableSignInSpinner();
             }
 
             switch (chosenTransport)
@@ -102,8 +102,7 @@ IEnumerator DisplayUTPReconnectAttempts(int maxReconnectAttempts, int connectTim
         // invoked by UI cancel button
         public void OnCancelJoinButtonPressed()
         {
-            m_IPUIMediator.RequestShutdown();
-            m_IPUIMediator.ConnectingFinished();
+            m_IPUIMediator.JoiningWindowCancelled();
             End();
         }
     }

Assets/BossRoom/Scripts/Client/UI/IPUIMediator.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using TMPro;
 using Unity.Multiplayer.Samples.BossRoom.Client;
@@ -105,17 +104,18 @@ public void JoinWithIP(string ip, string port)
             m_IPConnectionWindow.ShowConnectingWindow();
         }
 
-        void CancelConnectingWindow()
+        public void JoiningWindowCancelled()
         {
-            m_IPConnectionWindow.Cancel();
+            DisableSignInSpinner();
+            RequestShutdown();
         }
 
-        public void ConnectingFinished()
+        public void DisableSignInSpinner()
         {
             m_SignInSpinner.SetActive(false);
         }
 
-        public void RequestShutdown()
+        void RequestShutdown()
         {
             if (m_GameNetPortal && m_GameNetPortal.NetManager && m_GameNetPortal.NetManager.IsListening)
             {
@@ -154,17 +154,21 @@ public void Show()
             m_CanvasGroup.interactable = true;
             m_CanvasGroup.blocksRaycasts = true;
 
-            m_SignInSpinner.SetActive(false);
+            DisableSignInSpinner();
         }
 
         public void Hide()
         {
             m_CanvasGroup.alpha = 0f;
             m_CanvasGroup.interactable = false;
             m_CanvasGroup.blocksRaycasts = false;
+        }
 
-            CancelConnectingWindow();
+        // To be called from the Cancel (X) UI button
+        public void CancelConnectingWindow()
+        {
             RequestShutdown();
+            m_IPConnectionWindow.Cancel();
         }
 
         /// <summary>