EOS Disable Fix

Author: JessTello

Assets/Plugins/Source/Editor/EditorWindows/EncryptionKeyWindow.cs

@@ -48,12 +48,16 @@ public EncryptionKeyWindow() : base("Client Credential Encryption Key", 600f, 50
         /// </param>
         public static void Show(string input, Action<string> onSubmitCallback)
         {
-            ScheduleShow<EncryptionKeyWindow>(
-                input,
-                onSubmitCallback,
-                EOSClientCredentials.IsEncryptionKeyValid,
-                "Enter the encryption key for these client credentials here:",
-                "Invalid encryption key. Encryption key must be 64 characters long and contain only alphanumeric characters.");
+#if !EOS_DISABLE
+    ScheduleShow<EncryptionKeyWindow>(
+        input,
+        onSubmitCallback,
+        EOSClientCredentials.IsEncryptionKeyValid,
+        "Enter the encryption key for these client credentials here:",
+        "Invalid encryption key. Encryption key must be 64 characters long and contain only alphanumeric characters.");
+#else
+            Debug.LogWarning("EOS SDK is disabled. Encryption key window is not available.");
+#endif
         }
 
         /// <summary>
@@ -63,16 +67,25 @@ protected override void RenderModalContents()
         {
             GUILayout.BeginHorizontal();
 
-            _input = GUILayout.TextField(_input, GUILayout.Width(GUIEditorUtility.MeasureLabelWidth(64)), GUILayout.Height(20));
+            _input = GUILayout.TextField(
+                _input,
+                GUILayout.Width(EditorStyles.label.CalcSize(new GUIContent("Encryption Key")).x),
+                GUILayout.Height(20));
 
             GUILayout.Space(5f);
 
-            if (GUILayout.Button(
-                new GUIContent(EditorGUIUtility.IconContent("Refresh").image,
-                "Click here to generate a new encryption key."), GUILayout.Height(20), GUILayout.Width(50)))
-            {
-                _input = EOSClientCredentials.GenerateEncryptionKey();
-            }
+#if !EOS_DISABLE
+    if (GUILayout.Button(
+        new GUIContent(EditorGUIUtility.IconContent("Refresh").image,
+        "Click here to generate a new encryption key."),
+        GUILayout.Height(20), GUILayout.Width(50)))
+    {
+        _input = EOSClientCredentials.GenerateEncryptionKey();
+    }
+#else
+            GUILayout.Label("EOS SDK is disabled.");
+#endif
+
             GUILayout.EndHorizontal();
         }
     }

Assets/Plugins/Source/Editor/EditorWindows/ModalEOSEditorWindow.cs

@@ -189,9 +189,7 @@ protected override void RenderWindow()
             bool shouldClose = false;
 
             // Render the prompt text
-            EditorGUILayout.LabelField(_inputPrompt, GUILayout.Width(
-                GUIEditorUtility.MeasureLabelWidth(_inputPrompt))
-            );
+            EditorGUILayout.LabelField(_inputPrompt, GUILayout.Width(EditorStyles.label.CalcSize(new GUIContent(_inputPrompt)).x));
 
             // Display error if it needs to be displayed.
             if (_showError)

com.playeveryware.eos/Runtime/Core/EOSManager.cs

@@ -184,17 +184,7 @@ enum EOSState
         static private bool s_isConstrained = true;
         static public bool ApplicationIsConstrained { get => s_isConstrained; }
 
-        /// <summary>
-        /// Actions that need to be executed on the main thread.
-        /// Lazy allocated in <see cref="DispatchAsync"/>.
-        /// </summary>
-        private static List<Action> s_enqueuedTasks;
 
-        /// <summary>
-        /// Locak object used for <see cref="s_enqueuedTasks"/>, such that it can
-        /// be executed thread-safe way.
-        /// </summary>
-        private static System.Object s_enqueuedTasksLock = new System.Object();
         //private static List
 
         //-------------------------------------------------------------------------
@@ -1844,6 +1834,18 @@ static public EOSSingleton Instance
             }
         }
 
+        /// <summary>
+        /// Actions that need to be executed on the main thread.
+        /// Lazy allocated in <see cref="DispatchAsync"/>.
+        /// </summary>
+        private static List<Action> s_enqueuedTasks;
+
+        /// <summary>
+        /// Locak object used for <see cref="s_enqueuedTasks"/>, such that it can
+        /// be executed thread-safe way.
+        /// </summary>
+        private static System.Object s_enqueuedTasksLock = new System.Object();
+
 #if !EOS_DISABLE
         //-------------------------------------------------------------------------
         /// <summary>Unity [Awake](https://docs.unity3d.com/ScriptReference/MonoBehaviour.Awake.html) is called when script instance is being loaded.