From 451d604f70b381aa5d77143d6ee3fed5caec0054 Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.darkarchon@outlook.com>
Date: Sun, 29 Jan 2023 16:33:42 +0100
Subject: [PATCH] fixes pair notes, showing server state on stopping
 connections

---
 MareSynchronos/MareSynchronos.csproj   |  2 +-
 MareSynchronos/UI/CompactUI.cs         |  8 ++++++--
 MareSynchronos/Utils/Crypto.cs         | 14 +++++++++-----
 MareSynchronos/WebAPI/ApiController.cs |  3 ++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index 70c4bc8..b1a1283 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.7.1</Version>
+    <Version>0.7.2</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>
diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs
index 530247c..be99721 100644
--- a/MareSynchronos/UI/CompactUI.cs
+++ b/MareSynchronos/UI/CompactUI.cs
@@ -444,8 +444,12 @@ public class CompactUi : Window, IDisposable
 
             if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
             {
-                entry.SetNote(EditUserComment);
-                _configService.Save();
+                var pair = _pairManager.DirectPairs.Find(p => p.UserData.UID == EditNickEntry);
+                if (pair != null)
+                {
+                    pair.SetNote(EditUserComment);
+                    _configService.Save();
+                }
                 EditUserComment = entry.GetNote() ?? string.Empty;
                 EditNickEntry = entry.UserPair!.User.UID;
             }
diff --git a/MareSynchronos/Utils/Crypto.cs b/MareSynchronos/Utils/Crypto.cs
index 9d57541..cee2785 100644
--- a/MareSynchronos/Utils/Crypto.cs
+++ b/MareSynchronos/Utils/Crypto.cs
@@ -6,23 +6,27 @@ namespace MareSynchronos.Utils;
 
 public static class Crypto
 {
-    public static string GetFileHash(string filePath)
+    public static string GetFileHash(this string filePath)
     {
-        return BitConverter.ToString(SHA1.HashData(File.ReadAllBytes(filePath))).Replace("-", "", StringComparison.Ordinal);
+        using SHA1CryptoServiceProvider cryptoProvider = new();
+        return BitConverter.ToString(cryptoProvider.ComputeHash(File.ReadAllBytes(filePath))).Replace("-", "", StringComparison.Ordinal);
     }
 
     public static string GetHash(this string stringToHash)
     {
-        return BitConverter.ToString(SHA1.HashData(Encoding.UTF8.GetBytes(stringToHash))).Replace("-", "", StringComparison.Ordinal);
+        using SHA1CryptoServiceProvider cryptoProvider = new();
+        return BitConverter.ToString(cryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(stringToHash))).Replace("-", "", StringComparison.Ordinal);
     }
 
     public static string GetHash256(this string stringToHash)
     {
-        return BitConverter.ToString(SHA256.HashData(Encoding.UTF8.GetBytes(stringToHash))).Replace("-", "", StringComparison.Ordinal);
+        using SHA256CryptoServiceProvider cryptoProvider = new();
+        return BitConverter.ToString(cryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(stringToHash))).Replace("-", "", StringComparison.Ordinal);
     }
 
     public static string GetHash256(this PlayerCharacter character)
     {
-        return BitConverter.ToString(SHA256.HashData(Encoding.UTF8.GetBytes(character.Name + character.HomeWorld.Id.ToString()))).Replace("-", "", StringComparison.Ordinal);
+        using SHA256CryptoServiceProvider cryptoProvider = new();
+        return BitConverter.ToString(cryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(character.Name + character.HomeWorld.Id.ToString()))).Replace("-", "", StringComparison.Ordinal);
     }
 }
diff --git a/MareSynchronos/WebAPI/ApiController.cs b/MareSynchronos/WebAPI/ApiController.cs
index 194fea6..5781ae1 100644
--- a/MareSynchronos/WebAPI/ApiController.cs
+++ b/MareSynchronos/WebAPI/ApiController.cs
@@ -375,6 +375,8 @@ public partial class ApiController : IDisposable, IMareHubClient
 
     private async Task StopConnection(CancellationToken token, ServerState state)
     {
+        ServerState = state;
+
         if (_mareHub is not null)
         {
             _initialized = false;
@@ -391,7 +393,6 @@ public partial class ApiController : IDisposable, IMareHubClient
             Disconnected?.Invoke();
             _pairManager.ClearPairs();
             _mareHub = null;
-            ServerState = state;
         }
     }