Merge pull request #980 from StephenHodgson/MRTK-SharingService

Update to AutoJoinSessionAndRoom
microsoft · Sep 25, 2017 · a7d2ce9 · a7d2ce9
2 parents 587c849 + 3c9d531
commit a7d2ce9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/Assets/HoloToolkit-Tests/Sharing/Scripts/UserNotifications.cs b/Assets/HoloToolkit-Tests/Sharing/Scripts/UserNotifications.cs
@@ -29,15 +29,6 @@ private void Connected(object sender = null, EventArgs e = null)
             SharingStage.Instance.SharingManagerConnected -= Connected;
 
             usersTracker = SharingStage.Instance.SessionUsersTracker;
-            string users = string.Empty;
-
-            for (int i = 0; i < usersTracker.CurrentUsers.Count; i++)
-            {
-                users += "\n" + usersTracker.CurrentUsers[i].GetName();
-            }
-
-            Debug.LogFormat("[User Notifications] {0} users in room.{1}", usersTracker.CurrentUsers.Count, users);
-
             localUser = SharingStage.Instance.Manager.GetLocalUser();
 
             usersTracker.UserJoined += NotifyUserJoined;

diff --git a/Assets/HoloToolkit/Sharing/Scripts/ServerSessionsTracker.cs b/Assets/HoloToolkit/Sharing/Scripts/ServerSessionsTracker.cs
@@ -5,9 +5,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using HoloToolkit.Unity;
-using UnityEngine;
 
 namespace HoloToolkit.Sharing
 {
@@ -52,7 +50,6 @@ public ServerSessionsTracker(SessionManager sessionMgr)
             if (sessionManager != null)
             {
                 sessionManagerAdapter = new SessionManagerAdapter();
-                sessionManager.AddListener(sessionManagerAdapter);
                 sessionManagerAdapter.ServerConnectedEvent += OnServerConnected;
                 sessionManagerAdapter.ServerDisconnectedEvent += OnServerDisconnected;
                 sessionManagerAdapter.SessionClosedEvent += OnSessionClosed;
@@ -62,6 +59,7 @@ public ServerSessionsTracker(SessionManager sessionMgr)
                 sessionManagerAdapter.UserChangedEvent += OnUserChanged;
                 sessionManagerAdapter.UserJoinedSessionEvent += OnUserJoined;
                 sessionManagerAdapter.UserLeftSessionEvent += OnUserLeft;
+                sessionManager.AddListener(sessionManagerAdapter);
             }
         }
 

diff --git a/Assets/HoloToolkit/Sharing/Scripts/SharingStage.cs b/Assets/HoloToolkit/Sharing/Scripts/SharingStage.cs
@@ -482,6 +482,7 @@ public void ConnectToServer(string serverAddress, int port)
 
         public void ConnectToServer()
         {
+            SessionsTracker.LeaveCurrentSession();
             Manager.SetServerConnectionInfo(ServerAddress, (uint)ServerPort);
         }
     }

diff --git a/Assets/HoloToolkit/Sharing/Scripts/Utilities/AutoJoinSessionAndRoom.cs b/Assets/HoloToolkit/Sharing/Scripts/Utilities/AutoJoinSessionAndRoom.cs
@@ -18,6 +18,11 @@ public class AutoJoinSessionAndRoom : Singleton<AutoJoinSessionAndRoom>
         /// </summary>
         private long roomID = 1;
 
+        /// <summary>
+        /// Time to wait before attempting to reconnect.
+        /// </summary>
+        public float Timeout = 1f;
+
         private static bool ShouldLocalUserCreateRoom
         {
             get
@@ -103,6 +108,8 @@ private IEnumerator AutoConnect()
                 Debug.Log("[AutoJoinSessionAndRoom] Attempting to connect...");
             }
 
+            yield return new WaitForSeconds(Timeout);
+
             if (!SharingStage.Instance.SessionsTracker.IsServerConnected)
             {
                 if (SharingStage.Instance.ShowDetailedLogs)
@@ -135,8 +142,7 @@ private IEnumerator AutoConnect()
 
             for (int i = 0; i < SharingStage.Instance.SessionsTracker.Sessions.Count; ++i)
             {
-                if (SharingStage.Instance.SessionsTracker.Sessions[i].GetName().GetString() ==
-                    SharingStage.Instance.SessionName)
+                if (SharingStage.Instance.SessionsTracker.Sessions[i].GetName().GetString() == SharingStage.Instance.SessionName)
                 {
                     sessionExists = true;
                     if (SharingStage.Instance.ShowDetailedLogs)
@@ -158,7 +164,10 @@ private IEnumerator AutoConnect()
                     Debug.LogFormat("[AutoJoinSessionAndRoom] Didn't find session {0}, making a new one...", SharingStage.Instance.SessionName);
                 }
 
-                yield return SharingStage.Instance.SessionsTracker.CreateSession(SharingStage.Instance.SessionName);
+                if (!SharingStage.Instance.SessionsTracker.CreateSession(SharingStage.Instance.SessionName))
+                {
+                    yield break;
+                }
 
                 yield return new WaitForEndOfFrame();