Merge pull request #236 from ZdenekM/master

Various stuff

Author: ZdenekM

.gitignore

@@ -22,6 +22,7 @@
 
 # Visual Studio cache directory
 .vs/
+.vscode/
 
 # Gradle cache directory
 .gradle/
@@ -85,4 +86,4 @@ $RECYCLE.BIN/
 *.msp
 
 # Windows shortcuts
-*.lnk
+*.lnk

.gitmodules

@@ -26,3 +26,6 @@
 [submodule "arcor2_AREditor/Submodules/off-screen-indicator"]
 	path = arcor2_AREditor/Submodules/off-screen-indicator
 	url = https://github.com/xBambusekD/off-screen-indicator.git
+[submodule "arcor2_areditor_private"]
+	path = arcor2_AREditor/Submodules/arcor2_areditor_private
+	url = git@github.com:robofit/arcor2_areditor_private.git

arcor2_AREditor/Assets/BASE/Scripts/NotificationsModernUI.cs

@@ -100,7 +100,13 @@ public async override void SaveLogs(IO.Swagger.Model.Scene scene, IO.Swagger.Mod
             }
             logsFile.Close();
             ShowNotification(customNotificationTitle, "Logs saved to directory " + dirname);
-            string uri = "http://" + WebsocketManager.Instance.GetServerDomain() + ":6799/upload";
+
+            // TODO why we upload logs only when the editor is connected to the server?
+            string serverDomain = WebsocketManager.Instance.GetServerDomain();
+            
+            if (String.IsNullOrEmpty(serverDomain)) return;
+
+            string uri = "http://" + serverDomain + ":6799/upload";
             try {
                 if (File.Exists(zipname)) {
                     File.Delete(zipname);

arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs

@@ -204,9 +204,10 @@ public void CleanupAfterDisconnect() {
         /// </summary>
         /// <returns>Domain name or IP addr of server</returns>
         public string GetServerDomain() {
-            if (websocket.State != WebSocketState.Open) {
+            if (websocket == null || websocket.State != WebSocketState.Open) {
                 return null;
             }
+            Debug.Assert(serverDomain != null, "serverDomain is null");
             return serverDomain;
         }
 

arcor2_AREditor/Assets/Editor.meta

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e33f0ae6a91754a3d8a1f4e1a8ddd0d6, type: 3}
+  m_Name: RuntimeConfig
+  m_EditorClassIdentifier: 
+  IOSCloudServicesApiKey: 
+  ModulesEnabled: []