t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes pair notes, showing server state on stopping connections

Browse Source
This commit is contained in:
rootdarkarchon
2023-01-29 16:33:42 +01:00
parent 7e1a973178
commit 451d604f70
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronos/MareSynchronos.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Authors></Authors> <Authors></Authors>
<Company></Company> <Company></Company>
<Version>0.7.1</Version> <Version>0.7.2</Version>
<Description></Description> <Description></Description>
<Copyright></Copyright> <Copyright></Copyright>
<PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl> <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>

8
MareSynchronos/UI/CompactUI.cs
View File

@@ -444,8 +444,12 @@ public class CompactUi : Window, IDisposable
if (ImGui.IsItemClicked(ImGuiMouseButton.Right)) if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
{ {
entry.SetNote(EditUserComment); var pair = _pairManager.DirectPairs.Find(p => p.UserData.UID == EditNickEntry);
_configService.Save(); if (pair != null)
{
pair.SetNote(EditUserComment);
_configService.Save();
}
EditUserComment = entry.GetNote() ?? string.Empty; EditUserComment = entry.GetNote() ?? string.Empty;
EditNickEntry = entry.UserPair!.User.UID; EditNickEntry = entry.UserPair!.User.UID;
} }

14
MareSynchronos/Utils/Crypto.cs
View File

@@ -6,23 +6,27 @@ namespace MareSynchronos.Utils;
public static class Crypto 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) 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) 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) 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);
} }
} }

3
MareSynchronos/WebAPI/ApiController.cs
View File

@@ -375,6 +375,8 @@ public partial class ApiController : IDisposable, IMareHubClient
private async Task StopConnection(CancellationToken token, ServerState state) private async Task StopConnection(CancellationToken token, ServerState state)
{ {
ServerState = state;
if (_mareHub is not null) if (_mareHub is not null)
{ {
_initialized = false; _initialized = false;
@@ -391,7 +393,6 @@ public partial class ApiController : IDisposable, IMareHubClient
Disconnected?.Invoke(); Disconnected?.Invoke();
_pairManager.ClearPairs(); _pairManager.ClearPairs();
_mareHub = null; _mareHub = null;
ServerState = state;
} }
} }