Merge branch 'development' into fix/package-json-author

Author: paulhazen

Assets/Plugins/Source/Editor/ConfigEditors/ConfigEditor.cs

@@ -74,11 +74,14 @@ public class ConfigEditor<T> : IConfigEditor where T : EpicOnlineServices.Config
         /// collapsed, as animating that requires calling the repaint function
         /// that is typically called from within EditorWindow.
         /// </param>
-        public ConfigEditor(UnityAction repaintFn = null)
+        public ConfigEditor(UnityAction repaintFn = null, bool startsExpanded = false)
         {
             Type configType = typeof(T);
 
             ConfigGroupAttribute attribute = configType.GetCustomAttribute<ConfigGroupAttribute>();
+
+            _expanded = startsExpanded;
+
             _animExpanded = new(attribute.Collapsible);
 
             _labelText = attribute.Label;
@@ -112,7 +115,7 @@ private bool Expanded
                 _expanded = value;
                 if (_expanded)
                 {
-                    OnExpanded(this);
+                    OnExpanded?.Invoke(this);
                 }
             }
         }
@@ -123,7 +126,7 @@ private bool Expanded
         public void Expand()
         {
             Expanded = true;
-            OnExpanded(this);
+            OnExpanded?.Invoke(this);
         }
 
         /// <summary>

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

@@ -45,7 +45,7 @@ public static void OpenUnitTestSettingsWindow()
 
         protected override async Task AsyncSetup()
         {
-            _testConfigEditor = new ConfigEditor<UnitTestConfig>();
+            _testConfigEditor = new ConfigEditor<UnitTestConfig>(Repaint, true);
             await _testConfigEditor.LoadAsync();
         }
 

Assets/Scripts/EOSPlayerDataStorageManager.cs

@@ -188,16 +188,16 @@ public bool StartFileDataUpload(string fileName, Action fileCreatedCallback = nu
             CancelCurrentTransfer();
             CurrentTransferHandle = req;
 
-            EOSTransferInProgress newTransfer = new EOSTransferInProgress();
-            newTransfer.Download = false;
-
-            newTransfer.TotalSize = (uint)fileData.Length;
-            if (newTransfer.TotalSize > 0)
+            EOSTransferInProgress newTransfer = new()
             {
-                byte[] utf8ByteArray = System.Text.Encoding.UTF8.GetBytes(fileData);
+                Download = false
+            };
 
-                newTransfer.Data = utf8ByteArray;
+            if (null != fileData)
+            {
+                newTransfer.Data = System.Text.Encoding.UTF8.GetBytes(fileData);
             }
+
             newTransfer.CurrentIndex = 0;
 
             TransfersInProgress[fileName] = newTransfer;
@@ -376,14 +376,9 @@ private ReadResult ReceiveData(string fileName, ArraySegment<byte> data, uint to
                 }
 
                 // First update
-                if (transfer.CurrentIndex == 0 && transfer.TotalSize == 0)
+                if (transfer.CurrentIndex == 0)
                 {
-                    transfer.TotalSize = totalSize;
-
-                    if (transfer.TotalSize == 0)
-                    {
-                        return ReadResult.ContinueReading;
-                    }
+                    transfer.Data = new byte[totalSize];
                 }
 
                 // If more data has been received than was anticipated, fail the request

Assets/Scripts/EOSTitleStorageManager.cs

@@ -370,14 +370,9 @@ private ReadResult ReceiveData(string fileName, ArraySegment<byte> data, uint to
                 }
 
                 // First update
-                if (transfer.CurrentIndex == 0 && transfer.TotalSize == 0)
+                if (transfer.CurrentIndex == 0)
                 {
-                    transfer.TotalSize = totalSize;
-
-                    if (transfer.TotalSize == 0)
-                    {
-                        return ReadResult.RrContinuereading;
-                    }
+                    transfer.Data = new byte[totalSize];
                 }
 
                 // Make sure we have enough space

Assets/Scripts/EOSTransferInProgress.cs

@@ -26,6 +26,8 @@
 
 namespace PlayEveryWare.EpicOnlineServices.Samples
 {
+    using Editor.Utility;
+
     /// <summary>
     /// Class <c>EOSTransferInProgress</c> is used in <c>EOSTitleStorageManager</c> and <c>EOSPlayerDataStorageManager</c> to keep track of downloaded cached file data.
     /// </summary>
@@ -37,24 +39,40 @@ public class EOSTransferInProgress
 
         public bool Download = true;
         public uint CurrentIndex = 0;
-        public byte[] Data;
-        private uint transferSize = 0;
+        private byte[] _data;
 
-        public uint TotalSize
+        public byte[] Data
         {
             get
             {
-                return transferSize;
+                return _data;
             }
             set
             {
-                transferSize = value;
-
-                if (transferSize > FileMaxSizeBytes)
+                // If the file sizer is larger than the maximum allowable size,
+                // then log an error, but do not throw an exception, since
+                // throwing an exception from a property setter is a little
+                // confusing, and there will be an opportunity to catch the 
+                // mistake when EOS returns an error code.
+                if (null != value && value.Length > FileMaxSizeBytes)
                 {
-                    Debug.LogError("[EOS SDK] Player data storage: data transfer size exceeds max file size.");
-                    transferSize = FileMaxSizeBytes;
+                    Debug.LogError($"Maximum file size is 200MB.");
                 }
+
+                _data = value;
+            }
+        }
+
+        public uint TotalSize
+        {
+            get
+            {
+                if (null == _data)
+                    return 0;
+
+                _ = SafeTranslatorUtility.TryConvert(_data.Length, out uint totalSize);
+
+                return totalSize;
             }
         }
 

Assets/Scripts/StandardSamples/UI/Common/SampleMenu.cs

@@ -211,9 +211,7 @@ protected virtual void OnEnable()
         /// </summary>
         protected virtual void Update()
         {
-            // If nothing is selected, set the selected (focused) control to be
-            // UIFirstSelected (if that field has been set).
-            SetSelected();
+            // Default behavior is to take no action.
         }
 
         /// <summary>

etc/PackageConfigurations/eos_package_description.json

@@ -13,7 +13,8 @@
         {"src": "Assets/EOS.meta",  "dest": "Runtime/"     },
         {"src": "Assets/EOS/*.png", "dest": "Runtime/EOS/" },
 
-        {"src": "Assets/Plugins/*",                                "dest": "Runtime/"                             },
+        {"src": "Assets/Plugins/*",                                        "dest": "Runtime/"                             },
+        {"src": "com.playeveryware.eos/Runtime/*",                         "dest": "Runtime/" },
         {"src": "com.playeveryware.eos/Runtime/Core/*",                    "dest": "Runtime/Core/"                        },
         {"src": "com.playeveryware.eos/Runtime/Core/Utility/*",            "dest": "Runtime/Core/Utility/"                },
         {"src": "com.playeveryware.eos/Runtime/Core/Utility/Extensions/*", "dest": "Runtime/Core/Utility/Extensions/"     },