Sharing fixes

Assets/HoloToolkit/Sharing/Scripts/SharingStage.cs

@@ -1,17 +1,16 @@
-using System;
+using HoloToolkit.Unity;
+using System;
 using UnityEngine;
 
 namespace HoloToolkit.Sharing
 {
-    public class SharingStage : MonoBehaviour
+    public class SharingStage : Singleton<SharingStage>
     {
         /// <summary>
         /// SharingManagerConnected event notifies when the sharing manager is created and connected.
         /// </summary>
         public event EventHandler SharingManagerConnected;
 
-        public static SharingStage Instance = null;
-
         /// <summary>
         /// Set whether this app should be a Primary or Secondary client.
         /// Primary: Connects directly to the Session Server, can create/join/leave sessions
@@ -48,29 +47,39 @@ public class SharingStage : MonoBehaviour
         /// Provides callbacks when server is discovered or lost.
         /// </summary>
         private DiscoveryClientAdapter discoveryClientAdapter;
+
+        /// <summary>
+        /// Provides callbacks for when we connect to a server.
+        /// </summary>
+        private NetworkConnectionAdapter networkConnectionAdapter = null;
+
+        private NetworkConnection networkConnection = null;
 
         private float pingIntervalCurrent = 0;
         private bool isTryingToFindServer = false;
 
         private void Awake()
         {
-            Instance = this;
-
             this.logWriter = new ConsoleLogWriter();
 
             if (AutoDiscoverServer)
             {
                 AutoDiscoverInit();
             }
-            else
+
+            networkConnectionAdapter = new NetworkConnectionAdapter();
+        }
+
+        private void Start()
+        {
+            if (!AutoDiscoverServer)
             {
                 Connect();
             }
         }
 
         protected void OnDestroy()
         {
-            Instance = null;
 
             if (this.discoveryClient != null)
             {
@@ -85,6 +94,19 @@ protected void OnDestroy()
                 }
             }
 
+            if (this.networkConnection != null)
+            {
+                networkConnection.RemoveListener((byte)MessageID.StatusOnly, networkConnectionAdapter);
+                networkConnection.Dispose();
+                networkConnection = null;
+
+                if (networkConnectionAdapter != null)
+                {
+                    networkConnectionAdapter.Dispose();
+                    networkConnectionAdapter = null;
+                }
+            }
+
             if (this.sharingMgr != null)
             {
                 // Force a disconnection so that we can stop and start Unity without connections hanging around
@@ -133,8 +155,19 @@ private void Connect()
 
             this.sharingMgr = SharingManager.Create(config);
 
+            //set up callbacks so that we know when we've connected successfully
+            this.networkConnection = sharingMgr.GetServerConnection();
+            this.networkConnectionAdapter = new NetworkConnectionAdapter();
+            networkConnectionAdapter.ConnectedCallback += NetworkConnectionAdapter_ConnectedCallback;
+            networkConnection.AddListener((byte)MessageID.StatusOnly, networkConnectionAdapter);
+
             //delay sending notification so everything is initialized properly
-            Invoke("SendConnectedNotification", 1);
+            //Invoke("SendConnectedNotification", 1);
+        }
+
+        private void NetworkConnectionAdapter_ConnectedCallback(NetworkConnection obj)
+        {
+            SendConnectedNotification();
         }
 
         private void SendConnectedNotification()

Assets/HoloToolkit/Sharing/Tests/ImportExportAnchorManager.cs

@@ -116,18 +116,19 @@ public bool AnchorEstablished
     /// </summary>
     RoomManagerAdapter roomManagerCallbacks;
 
-    void Start()
+    void Awake()
     {
         Debug.Log("Import Export Manager starting");
-
-        currentState = ImportExportState.Ready;
-
         // We need to get our local anchor store started up.
         currentState = ImportExportState.AnchorStore_Initializing;
         WorldAnchorStore.GetAsync(AnchorStoreReady);
 
         //Wait for a notification that the sharing manager has been initialized (connected to sever)
         SharingStage.Instance.SharingManagerConnected += SharingManagerConnected;
+
+        // We will register for session joined to indicate when the sharing service
+        // is ready for us to make room related requests.
+        SharingSessionTracker.Instance.SessionJoined += Instance_SessionJoined;
     }
 
     void OnDestroy()
@@ -153,10 +154,6 @@ private void SharingManagerConnected(object sender, EventArgs e)
         roomManagerCallbacks.AnchorsDownloadedEvent += RoomManagerCallbacks_AnchorsDownloaded;
         roomManagerCallbacks.AnchorUploadedEvent += RoomManagerCallbacks_AnchorUploaded;
         roomManager.AddListener(roomManagerCallbacks);
-
-        // We will register for session joined to indicate when the sharing service
-        // is ready for us to make room related requests.
-        SharingSessionTracker.Instance.SessionJoined += Instance_SessionJoined;
     }
 
     /// <summary>