Bugfix/ai avatar

src/Tizen.AIAvatar/src/AIServices/Core/RestClient/RestClient.cs

@@ -27,9 +27,10 @@ namespace Tizen.AIAvatar
     /// A class that provides methods to execute REST requests and handle responses.
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public class RestClient : IRestClient
+    public class RestClient : IRestClient, IDisposable
     {
         private readonly HttpClient _httpClient;
+        private bool _disposed = false;
 
         /// <summary>
         /// Initializes a new instance of the RestClient class with the specified HttpClient.
@@ -38,7 +39,7 @@ public class RestClient : IRestClient
         [EditorBrowsable(EditorBrowsableState.Never)]
         public RestClient(HttpClient httpClient)
         {
-            _httpClient = httpClient;
+            _httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
         }
 
         /// <summary>
@@ -91,7 +92,24 @@ public async Task<RestResponse> ExecuteAsync(RestRequest request)
         [EditorBrowsable(EditorBrowsableState.Never)]
         public void Dispose()
         {
-            _httpClient?.Dispose();
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Disposes of the resources used by the RestClient.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposed)
+            {
+                if (disposing)
+                {
+                    _httpClient.Dispose();
+                }
+                _disposed = true;
+            }
         }
     }
 }

src/Tizen.AIAvatar/src/AIServices/Core/RestClient/ServiceClientManager.cs

@@ -52,10 +52,8 @@ public IRestClient GetClient(string endpoint)
         {
             if (!_clients.ContainsKey(endpoint))
             {
-                var client = new RestClient(new HttpClient
-                {
-                    BaseAddress = new Uri(endpoint)
-                });
+                var httpClient = new HttpClient { BaseAddress = new Uri(endpoint) };
+                var client = new RestClient(httpClient);
                 _clients[endpoint] = client;
             }
             return _clients[endpoint];

src/Tizen.AIAvatar/src/Multimedia/Audio/AudioPlayer.cs

@@ -320,9 +320,13 @@ private void OnStateChanged(object sender, AudioPlayerChangedEventArgs state)
                         audioPlayback?.Prepare();
                         Log.Debug(LogTag, "Audio is playing.");
                     }
-                    catch (NullReferenceException e)
+                    catch (ArgumentNullException ex)
                     {
-                        Log.Error(LogTag, $"NullReferenceException in Playing state: {e.Message}");
+                        Log.Error(LogTag, $"ArgumentNullException in Playing state: {ex.Message}");
+                    }
+                    catch (InvalidOperationException ex)
+                    {
+                        Log.Error(LogTag, $"InvalidOperationException in Playing state: {ex.Message}");
                     }
                     catch (Exception e)
                     {
@@ -343,9 +347,13 @@ private void OnStateChanged(object sender, AudioPlayerChangedEventArgs state)
 
                         Log.Debug(LogTag, "Audio is paused.");
                     }
-                    catch (NullReferenceException e)
+                    catch (ArgumentNullException ex)
+                    {
+                        Log.Error(LogTag, $"ArgumentNullException in Paused state: {ex.Message}");
+                    }
+                    catch (InvalidOperationException ex)
                     {
-                        Log.Error(LogTag, $"NullReferenceException in Paused state: {e.Message}");
+                        Log.Error(LogTag, $"InvalidOperationException in Paused state: {ex.Message}");
                     }
                     catch (Exception e)
                     {
@@ -370,9 +378,13 @@ private void OnStateChanged(object sender, AudioPlayerChangedEventArgs state)
 
                         Log.Debug(LogTag, "Audio is stopped.");
                     }
-                    catch (NullReferenceException e)
+                    catch (ArgumentNullException ex)
+                    {
+                        Log.Error(LogTag, $"ArgumentNullException in Stopped/Finished state: {ex.Message}");
+                    }
+                    catch (InvalidOperationException ex)
                     {
-                        Log.Error(LogTag, $"NullReferenceException in Stopped/Finished state: {e.Message}");
+                        Log.Error(LogTag, $"InvalidOperationException in Stopped/Finished state: {ex.Message}");
                     }
                     catch (Exception e)
                     {