From 0ca7f7869d02279946d89ed76056cf47c416ea3d Mon Sep 17 00:00:00 2001 From: AoshiW Date: Fri, 16 Aug 2024 21:14:57 +0200 Subject: [PATCH] add missing changes/feedback --- Needlework.Net.Desktop/ViewModels/ConsoleViewModel.cs | 11 ++--------- .../ViewModels/PathOperationViewModel.cs | 6 +++--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Needlework.Net.Desktop/ViewModels/ConsoleViewModel.cs b/Needlework.Net.Desktop/ViewModels/ConsoleViewModel.cs index 4a57d1e..0a2d1ec 100644 --- a/Needlework.Net.Desktop/ViewModels/ConsoleViewModel.cs +++ b/Needlework.Net.Desktop/ViewModels/ConsoleViewModel.cs @@ -61,16 +61,9 @@ namespace Needlework.Net.Desktop.ViewModels var content = new StringContent(requestBody, new System.Net.Http.Headers.MediaTypeHeaderValue("application/json")); var response = await Connector.SendAsync(method, RequestPath, content); var riotAuthentication = new RiotAuthentication(processInfo.RemotingAuthToken); - var responseBody = -#if DEBUG - await response.Content.ReadAsStringAsync(); -#else - await response.Content.ReadAsByteArrayAsync(); -#endif + var responseBody = await response.Content.ReadAsByteArrayAsync(); - var body = responseBody.Length > 0 - ? JsonSerializer.Serialize(JsonSerializer.Deserialize(responseBody), App.JsonSerializerOptions) - : string.Empty; + var body = responseBody.Length > 0 ? JsonSerializer.Serialize(JsonSerializer.Deserialize(responseBody), App.JsonSerializerOptions) : string.Empty; if (body.Length >= App.MaxCharacters) { WindowService.ShowOopsiesWindow(body); diff --git a/Needlework.Net.Desktop/ViewModels/PathOperationViewModel.cs b/Needlework.Net.Desktop/ViewModels/PathOperationViewModel.cs index fd221c4..0a6639c 100644 --- a/Needlework.Net.Desktop/ViewModels/PathOperationViewModel.cs +++ b/Needlework.Net.Desktop/ViewModels/PathOperationViewModel.cs @@ -99,11 +99,11 @@ namespace Needlework.Net.Desktop.ViewModels var requestBody = WeakReferenceMessenger.Default.Send(new ContentRequestMessage(), "EndpointRequestEditor").Response; var content = new StringContent(requestBody, new System.Net.Http.Headers.MediaTypeHeaderValue("application/json")); - var response = await Connector.SendAsync(method, uri, content) ?? throw new Exception("Response is null."); + var response = await Connector.SendAsync(method, uri, content); var riotAuthentication = new RiotAuthentication(processInfo.RemotingAuthToken); - var responseBody = await response.Content.ReadAsStringAsync(); + var responseBytes = await response.Content.ReadAsByteArrayAsync(); - responseBody = !string.IsNullOrEmpty(responseBody) ? JsonSerializer.Serialize(JsonSerializer.Deserialize(responseBody), App.JsonSerializerOptions) : string.Empty; + var responseBody = responseBytes.Length > 0 ? JsonSerializer.Serialize(JsonSerializer.Deserialize(responseBody), App.JsonSerializerOptions) : string.Empty; if (responseBody.Length >= App.MaxCharacters) { WeakReferenceMessenger.Default.Send(new OopsiesWindowRequestedMessage(responseBody));