Used the new API to unsubscribe directly from an ISubscriber - better readability in trivial cases

pdeschain · pdeschain · commit 43eda3fbb2fe · 2022-08-11T18:07:03.000-04:00
diff --git a/Assets/Scripts/Gameplay/GameState/ServerBossRoomState.cs b/Assets/Scripts/Gameplay/GameState/ServerBossRoomState.cs
@@ -51,8 +51,6 @@ public class ServerBossRoomState : GameStateBehaviour
         /// </summary>
         [Inject] ISubscriber<LifeStateChangedEventMessage> m_LifeStateChangedEventMessageSubscriber;
 
-        IDisposable m_Subscription;
-
         [Inject] ConnectionManager m_ConnectionManager;
 
         protected override void Awake()
@@ -71,15 +69,15 @@ void OnNetworkSpawn()
                 return;
             }
 
-            m_Subscription = m_LifeStateChangedEventMessageSubscriber.Subscribe(OnLifeStateChangedEventMessage);
+            m_LifeStateChangedEventMessageSubscriber.Subscribe(OnLifeStateChangedEventMessage);
 
             NetworkManager.Singleton.SceneManager.OnLoadComplete += OnServerLoadComplete;
             NetworkManager.Singleton.SceneManager.OnUnloadComplete += OnServerUnloadComplete;
         }
 
         void OnNetworkDespawn()
         {
-            m_Subscription?.Dispose();
+            m_LifeStateChangedEventMessageSubscriber.Unsubscribe(OnLifeStateChangedEventMessage);
 
             NetworkManager.Singleton.SceneManager.OnLoadComplete -= OnServerLoadComplete;
             NetworkManager.Singleton.SceneManager.OnUnloadComplete -= OnServerUnloadComplete;
@@ -116,7 +114,7 @@ void OnServerUnloadComplete(ulong clientId, string sceneName)
 
         protected override void OnDestroy()
         {
-            m_Subscription?.Dispose();
+            m_LifeStateChangedEventMessageSubscriber?.Unsubscribe(OnLifeStateChangedEventMessage);
 
             if (m_NetcodeHooks)
             {
diff --git a/Assets/Scripts/Gameplay/UI/IPConnectionWindow.cs b/Assets/Scripts/Gameplay/UI/IPConnectionWindow.cs
@@ -19,12 +19,13 @@ public class IPConnectionWindow : MonoBehaviour
 
         [Inject] IPUIMediator m_IPUIMediator;
 
-        IDisposable m_Subscription;
+        ISubscriber<ConnectStatus> m_ConnectStatusSubscriber;
 
         [Inject]
         void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSubscriber)
         {
-            m_Subscription = connectStatusSubscriber.Subscribe(OnConnectStatusMessage);
+            m_ConnectStatusSubscriber = connectStatusSubscriber;
+            m_ConnectStatusSubscriber.Subscribe(OnConnectStatusMessage);
         }
 
         void Awake()
@@ -34,7 +35,7 @@ void Awake()
 
         void OnDestroy()
         {
-            m_Subscription.Dispose();
+            m_ConnectStatusSubscriber.Unsubscribe(OnConnectStatusMessage);
         }
 
         void OnConnectStatusMessage(ConnectStatus connectStatus)
diff --git a/Assets/Scripts/Gameplay/UI/IPUIMediator.cs b/Assets/Scripts/Gameplay/UI/IPUIMediator.cs
@@ -39,12 +39,13 @@ public class IPUIMediator : MonoBehaviour
 
         public IPHostingUI IPHostingUI => m_IPHostingUI;
 
-        IDisposable m_Subscription;
+        ISubscriber<ConnectStatus> m_ConnectStatusSubscriber;
 
         [Inject]
         void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSubscriber)
         {
-            m_Subscription = connectStatusSubscriber.Subscribe(OnConnectStatusMessage);
+            m_ConnectStatusSubscriber = connectStatusSubscriber;
+            m_ConnectStatusSubscriber.Subscribe(OnConnectStatusMessage);
         }
 
         void Awake()
@@ -61,7 +62,7 @@ void Start()
 
         void OnDestroy()
         {
-            m_Subscription.Dispose();
+            m_ConnectStatusSubscriber.Unsubscribe(OnConnectStatusMessage);
         }
 
         void OnConnectStatusMessage(ConnectStatus connectStatus)
diff --git a/Assets/Scripts/Gameplay/UI/Lobby/LobbyJoiningUI.cs b/Assets/Scripts/Gameplay/UI/Lobby/LobbyJoiningUI.cs
@@ -22,7 +22,8 @@ public class LobbyJoiningUI : MonoBehaviour
         IObjectResolver m_Container;
         LobbyUIMediator m_LobbyUIMediator;
         UpdateRunner m_UpdateRunner;
-        IDisposable m_Subscriptions;
+        ISubscriber<LobbyListFetchedMessage> m_LocalLobbiesRefreshedSub;
+
         List<LobbyListItemUI> m_LobbyListItems = new List<LobbyListItemUI>();
 
         void Awake()
@@ -40,7 +41,7 @@ void OnDisable()
 
         void OnDestroy()
         {
-            m_Subscriptions?.Dispose();
+            m_LocalLobbiesRefreshedSub.Unsubscribe(UpdateUI);
         }
 
         [Inject]
@@ -53,7 +54,8 @@ void InjectDependenciesAndInitialize(
             m_Container = container;
             m_LobbyUIMediator = lobbyUIMediator;
             m_UpdateRunner = updateRunner;
-            m_Subscriptions = localLobbiesRefreshedSub.Subscribe(UpdateUI);
+            m_LocalLobbiesRefreshedSub = localLobbiesRefreshedSub;
+            m_LocalLobbiesRefreshedSub.Subscribe(UpdateUI);
         }
 
         /// <summary>
diff --git a/Assets/Scripts/Gameplay/UI/Lobby/LobbyUIMediator.cs b/Assets/Scripts/Gameplay/UI/Lobby/LobbyUIMediator.cs
@@ -28,7 +28,7 @@ public class LobbyUIMediator : MonoBehaviour
         LocalLobby m_LocalLobby;
         NameGenerationData m_NameGenerationData;
         ConnectionManager m_ConnectionManager;
-        IDisposable m_Subscriptions;
+        ISubscriber<ConnectStatus> m_ConnectStatusSubscriber;
 
         const string k_DefaultLobbyName = "no-name";
 
@@ -49,10 +49,10 @@ ConnectionManager connectionManager
             m_LobbyServiceFacade = lobbyServiceFacade;
             m_LocalLobby = localLobby;
             m_ConnectionManager = connectionManager;
-
+            m_ConnectStatusSubscriber = connectStatusSub;
             RegenerateName();
 
-            m_Subscriptions = connectStatusSub.Subscribe(OnConnectStatus);
+            m_ConnectStatusSubscriber.Subscribe(OnConnectStatus);
         }
 
         void OnConnectStatus(ConnectStatus status)
@@ -65,7 +65,7 @@ void OnConnectStatus(ConnectStatus status)
 
         void OnDestroy()
         {
-            m_Subscriptions?.Dispose();
+            m_ConnectStatusSubscriber.Unsubscribe(OnConnectStatus);
         }
 
         //Lobby and Relay calls done from UI
diff --git a/Assets/Scripts/Gameplay/UI/UnityServicesUIHandler.cs b/Assets/Scripts/Gameplay/UI/UnityServicesUIHandler.cs
@@ -10,7 +10,7 @@ namespace Unity.Multiplayer.Samples.BossRoom.Visual
 {
     public class UnityServicesUIHandler : MonoBehaviour
     {
-        IDisposable m_Subscriptions;
+        ISubscriber<UnityServiceErrorMessage> m_ServiceErrorSubscription;
 
         void Awake()
         {
@@ -20,7 +20,8 @@ void Awake()
         [Inject]
         void Initialize(ISubscriber<UnityServiceErrorMessage> serviceError)
         {
-            m_Subscriptions = serviceError.Subscribe(ServiceErrorHandler);
+            m_ServiceErrorSubscription = serviceError;
+            m_ServiceErrorSubscription.Subscribe(ServiceErrorHandler);
         }
 
         void ServiceErrorHandler(UnityServiceErrorMessage error)
@@ -86,7 +87,7 @@ void HandleLobbyError(UnityServiceErrorMessage error)
 
         void OnDestroy()
         {
-            m_Subscriptions?.Dispose();
+            m_ServiceErrorSubscription.Unsubscribe(ServiceErrorHandler);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,6 @@ public class ServerBossRoomState : GameStateBehaviour`
`51`	`51`	`/// </summary>`
`52`	`52`	`[Inject] ISubscriber<LifeStateChangedEventMessage> m_LifeStateChangedEventMessageSubscriber;`
`53`	`53`
`54`		`- IDisposable m_Subscription;`
`55`		`-`
`56`	`54`	`[Inject] ConnectionManager m_ConnectionManager;`
`57`	`55`
`58`	`56`	`protected override void Awake()`
`@@ -71,15 +69,15 @@ void OnNetworkSpawn()`
`71`	`69`	`return;`
`72`	`70`	`}`
`73`	`71`
`74`		`- m_Subscription = m_LifeStateChangedEventMessageSubscriber.Subscribe(OnLifeStateChangedEventMessage);`
	`72`	`+ m_LifeStateChangedEventMessageSubscriber.Subscribe(OnLifeStateChangedEventMessage);`
`75`	`73`
`76`	`74`	`NetworkManager.Singleton.SceneManager.OnLoadComplete += OnServerLoadComplete;`
`77`	`75`	`NetworkManager.Singleton.SceneManager.OnUnloadComplete += OnServerUnloadComplete;`
`78`	`76`	`}`
`79`	`77`
`80`	`78`	`void OnNetworkDespawn()`
`81`	`79`	`{`
`82`		`- m_Subscription?.Dispose();`
	`80`	`+ m_LifeStateChangedEventMessageSubscriber.Unsubscribe(OnLifeStateChangedEventMessage);`
`83`	`81`
`84`	`82`	`NetworkManager.Singleton.SceneManager.OnLoadComplete -= OnServerLoadComplete;`
`85`	`83`	`NetworkManager.Singleton.SceneManager.OnUnloadComplete -= OnServerUnloadComplete;`
`@@ -116,7 +114,7 @@ void OnServerUnloadComplete(ulong clientId, string sceneName)`
`116`	`114`
`117`	`115`	`protected override void OnDestroy()`
`118`	`116`	`{`
`119`		`- m_Subscription?.Dispose();`
	`117`	`+ m_LifeStateChangedEventMessageSubscriber?.Unsubscribe(OnLifeStateChangedEventMessage);`
`120`	`118`
`121`	`119`	`if (m_NetcodeHooks)`
`122`	`120`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,13 @@ public class IPConnectionWindow : MonoBehaviour`
`19`	`19`
`20`	`20`	`[Inject] IPUIMediator m_IPUIMediator;`
`21`	`21`
`22`		`- IDisposable m_Subscription;`
	`22`	`+ ISubscriber<ConnectStatus> m_ConnectStatusSubscriber;`
`23`	`23`
`24`	`24`	`[Inject]`
`25`	`25`	`void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSubscriber)`
`26`	`26`	`{`
`27`		`- m_Subscription = connectStatusSubscriber.Subscribe(OnConnectStatusMessage);`
	`27`	`+ m_ConnectStatusSubscriber = connectStatusSubscriber;`
	`28`	`+ m_ConnectStatusSubscriber.Subscribe(OnConnectStatusMessage);`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`void Awake()`
`@@ -34,7 +35,7 @@ void Awake()`
`34`	`35`
`35`	`36`	`void OnDestroy()`
`36`	`37`	`{`
`37`		`- m_Subscription.Dispose();`
	`38`	`+ m_ConnectStatusSubscriber.Unsubscribe(OnConnectStatusMessage);`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`void OnConnectStatusMessage(ConnectStatus connectStatus)`
Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,13 @@ public class IPUIMediator : MonoBehaviour`
`39`	`39`
`40`	`40`	`public IPHostingUI IPHostingUI => m_IPHostingUI;`
`41`	`41`
`42`		`- IDisposable m_Subscription;`
	`42`	`+ ISubscriber<ConnectStatus> m_ConnectStatusSubscriber;`
`43`	`43`
`44`	`44`	`[Inject]`
`45`	`45`	`void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSubscriber)`
`46`	`46`	`{`
`47`		`- m_Subscription = connectStatusSubscriber.Subscribe(OnConnectStatusMessage);`
	`47`	`+ m_ConnectStatusSubscriber = connectStatusSubscriber;`
	`48`	`+ m_ConnectStatusSubscriber.Subscribe(OnConnectStatusMessage);`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`void Awake()`
`@@ -61,7 +62,7 @@ void Start()`
`61`	`62`
`62`	`63`	`void OnDestroy()`
`63`	`64`	`{`
`64`		`- m_Subscription.Dispose();`
	`65`	`+ m_ConnectStatusSubscriber.Unsubscribe(OnConnectStatusMessage);`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`void OnConnectStatusMessage(ConnectStatus connectStatus)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Unity.Multiplayer.Samples.BossRoom.Visual`
`10`	`10`	`{`
`11`	`11`	`public class UnityServicesUIHandler : MonoBehaviour`
`12`	`12`	`{`
`13`		`- IDisposable m_Subscriptions;`
	`13`	`+ ISubscriber<UnityServiceErrorMessage> m_ServiceErrorSubscription;`
`14`	`14`
`15`	`15`	`void Awake()`
`16`	`16`	`{`
`@@ -20,7 +20,8 @@ void Awake()`
`20`	`20`	`[Inject]`
`21`	`21`	`void Initialize(ISubscriber<UnityServiceErrorMessage> serviceError)`
`22`	`22`	`{`
`23`		`- m_Subscriptions = serviceError.Subscribe(ServiceErrorHandler);`
	`23`	`+ m_ServiceErrorSubscription = serviceError;`
	`24`	`+ m_ServiceErrorSubscription.Subscribe(ServiceErrorHandler);`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`void ServiceErrorHandler(UnityServiceErrorMessage error)`
`@@ -86,7 +87,7 @@ void HandleLobbyError(UnityServiceErrorMessage error)`
`86`	`87`
`87`	`88`	`void OnDestroy()`
`88`	`89`	`{`
`89`		`- m_Subscriptions?.Dispose();`
	`90`	`+ m_ServiceErrorSubscription.Unsubscribe(ServiceErrorHandler);`
`90`	`91`	`}`
`91`	`92`	`}`
`92`	`93`	`}`