Release 3.3.4

Author: WispyMouse

CHANGELOG.md

@@ -2,6 +2,22 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.3.4] - 2024-11-26
+
+### Changed
+
+- Update to EOS SDK 1.14.3.
+
+### Added
+
+- feat: EOSManager can have UserLoginInfo Provided to it
+- feat: Authentication Listener knows the difference between a Connect and Auth login
+
+### Fixed
+
+- fix: Add isolated changes that address the Android thread IO issue.
+- fix: Correct usage of FileSystemUtility in the IOSBuilder.
+
 ## [3.3.3] - 2024-09-19
 
 ### Added

Editor/Platforms/iOS/IOSBuilder.cs

@@ -22,6 +22,7 @@
 #if !EOS_DISABLE
 namespace PlayEveryWare.EpicOnlineServices.Editor.Build
 {
+    using EpicOnlineServices.Utility;
     using System.IO;
     using UnityEditor;
     using UnityEditor.Build.Reporting;
@@ -60,7 +61,7 @@ public override void PostBuild(BuildReport report)
 
             PBXProject proj = new();
 
-            proj.ReadFromString(FileUtility.ReadAllText(projPath));
+            proj.ReadFromString(FileSystemUtility.ReadAllText(projPath));
 
             string targetGUID = proj.GetUnityMainTargetGuid();
             string unityTargetGUID = proj.GetUnityFrameworkTargetGuid();

PlatformSpecificAssets~/EOS/Android/dynamic-stdc++/aar/eos-sdk.aar

@@ -1,45 +1,65 @@
 /*
- * Copyright (c) 2024 PlayEveryWare
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+* Copyright (c) 2024 PlayEveryWare
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
 
 namespace PlayEveryWare.EpicOnlineServices
 {
     using System;
+    using System.IO;
     using System.Threading.Tasks;
     using UnityEngine;
     using UnityEngine.Networking;
 
     public class AndroidFileIOHelper
     {
-        public static async Task<string> ReadAllText(string filePath)
+        public static bool FileExists(string filePath)
         {
             using UnityWebRequest request = UnityWebRequest.Get(filePath);
-            request.timeout = 2; //seconds till timeout
-            UnityWebRequestAsyncOperation operation = request.SendWebRequest();
+            request.timeout = 2;
+            request.SendWebRequest();
+            while (!request.isDone) { }
+
+            bool exists = (request.result == UnityWebRequest.Result.Success);
 
-            while (!operation.isDone)
+            if (!exists)
             {
-                await Task.Yield();
+                Debug.LogError($"AndroidFileIOHelper says that \"{filePath}\" does not exist.");
             }
 
+            return exists;
+        }
+
+        public static string ReadAllText(string filePath)
+        {
+            using UnityWebRequest request = UnityWebRequest.Get(filePath);
+            request.timeout = 2; //seconds till timeout
+            request.SendWebRequest();
+
+            while (!request.isDone) { }
+
+            return ProcessRequest(filePath, request);
+        }
+
+        private static string ProcessRequest(string filePath, UnityWebRequest request)
+        {
             string text = null;
 
             switch (request.result)
@@ -72,4 +92,4 @@ public static async Task<string> ReadAllText(string filePath)
             return text;
         }
     }
-}
+}

PlatformSpecificAssets~/EOS/Android/static-stdc++/aar/eos-sdk.aar

@@ -34,6 +34,28 @@ namespace PlayEveryWare.EpicOnlineServices
     /// </summary>
     public class AuthenticationListener: IAuthInterfaceEventListener, IConnectInterfaceEventListener, IDisposable
     {
+        /// <summary>
+        /// Identifies the kind of authentication change.
+        /// </summary>
+        public enum LoginChangeKind
+        {
+            /// <summary>
+            /// Represents a login change relating to the Auth-login type with EOS.
+            /// A user logged in with the Auth Interface has access to Epic
+            /// Account Services (EAS) operations.
+            /// </summary>
+            Auth,
+
+            /// <summary>
+            /// Represents a login change relating to the Connect-login type with EOS.
+            /// A user logged in with the Connect Interface has access to all
+            /// EOS Game Services.
+            /// Typically a user will be logged in to Auth and then afterwards
+            /// logged in to Connect.
+            /// </summary>
+            Connect
+        }
+
         /// <summary>
         /// Used to describe functions that handle change in authentication
         /// state.
@@ -42,7 +64,7 @@ public class AuthenticationListener: IAuthInterfaceEventListener, IConnectInterf
         /// True if the authentication state has changed to authenticated, False
         /// otherwise.
         /// </param>
-        public delegate void AuthenticationChangedEventHandler(bool authenticated);
+        public delegate void AuthenticationChangedEventHandler(bool authenticated, LoginChangeKind changeType);
 
         /// <summary>
         /// Event that triggers when the state of authentication has changed.
@@ -104,7 +126,8 @@ public bool IsAuthenticated
         /// </summary>
         /// <param name="attemptedState"></param>
         /// <param name="attemptResult"></param>
-        private void TriggerAuthenticationChangedEvent(bool attemptedState, Result attemptResult)
+        /// <param name="changeType">The type of authentication change.</param>
+        private void TriggerAuthenticationChangedEvent(bool attemptedState, Result attemptResult, LoginChangeKind changeType)
         {
             // If the attempt to change the state of authentication did not 
             // succeed, then log a warning and stop.
@@ -119,7 +142,7 @@ private void TriggerAuthenticationChangedEvent(bool attemptedState, Result attem
 
             // Trigger the event indicating that the state of authentication for 
             // the user has changed.
-            AuthenticationChanged?.Invoke(attemptedState);
+            AuthenticationChanged?.Invoke(attemptedState, changeType);
         }
 
         /// <summary>
@@ -130,7 +153,7 @@ private void TriggerAuthenticationChangedEvent(bool attemptedState, Result attem
         /// </param>
         public void OnAuthLogin(LoginCallbackInfo loginCallbackInfo)
         {
-            TriggerAuthenticationChangedEvent(true, loginCallbackInfo.ResultCode);
+            TriggerAuthenticationChangedEvent(true, loginCallbackInfo.ResultCode, LoginChangeKind.Auth);
         }
 
         /// <summary>
@@ -141,7 +164,7 @@ public void OnAuthLogin(LoginCallbackInfo loginCallbackInfo)
         /// </param>
         public void OnAuthLogout(LogoutCallbackInfo logoutCallbackInfo)
         {
-            TriggerAuthenticationChangedEvent(false, logoutCallbackInfo.ResultCode);
+            TriggerAuthenticationChangedEvent(false, logoutCallbackInfo.ResultCode, LoginChangeKind.Auth);
         }
 
         /// <summary>
@@ -152,7 +175,7 @@ public void OnAuthLogout(LogoutCallbackInfo logoutCallbackInfo)
         /// </param>
         public void OnConnectLogin(Epic.OnlineServices.Connect.LoginCallbackInfo loginCallbackInfo)
         {
-            TriggerAuthenticationChangedEvent(true, loginCallbackInfo.ResultCode);
+            TriggerAuthenticationChangedEvent(true, loginCallbackInfo.ResultCode, LoginChangeKind.Connect);
         }
 
         /// <summary>