From 79fca84c7096d3b1470778340bc175993b467634 Mon Sep 17 00:00:00 2001 From: Macocian Alexandru Victor Date: Fri, 27 Sep 2024 17:27:14 +0200 Subject: [PATCH] Update GWCA module (#819) --- Daybreak/Controls/Templates/GuildwarsPathTemplate.xaml.cs | 2 +- Daybreak/Controls/Templates/TradeChatTemplate.xaml.cs | 3 --- Daybreak/Daybreak.csproj | 2 +- Daybreak/Exceptions/CredentialsNotFoundException.cs | 3 --- Daybreak/Exceptions/ExecutableNotFoundException.cs | 3 --- Daybreak/Exceptions/FatalException.cs | 4 ---- Daybreak/Services/Credentials/CredentialManager.cs | 1 + Daybreak/Services/Graph/GraphClient.cs | 1 + Daybreak/Services/UBlockOrigin/UBlockOriginService.cs | 2 +- GWCA | 2 +- 10 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Daybreak/Controls/Templates/GuildwarsPathTemplate.xaml.cs b/Daybreak/Controls/Templates/GuildwarsPathTemplate.xaml.cs index cbc2951e..cbeba639 100644 --- a/Daybreak/Controls/Templates/GuildwarsPathTemplate.xaml.cs +++ b/Daybreak/Controls/Templates/GuildwarsPathTemplate.xaml.cs @@ -74,7 +74,7 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e) private async void ExecutablePath_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e) { - if (this.DataContext is not ExecutablePath executablePath) + if (this.DataContext is not ExecutablePath) { return; } diff --git a/Daybreak/Controls/Templates/TradeChatTemplate.xaml.cs b/Daybreak/Controls/Templates/TradeChatTemplate.xaml.cs index 9b6ccde2..183f0176 100644 --- a/Daybreak/Controls/Templates/TradeChatTemplate.xaml.cs +++ b/Daybreak/Controls/Templates/TradeChatTemplate.xaml.cs @@ -25,12 +25,9 @@ namespace Daybreak.Controls.Templates; public partial class TradeChatTemplate : UserControl { private readonly TimeSpan timeUpdateInterval = TimeSpan.FromSeconds(1); - private readonly object collectionLock = new(); private readonly DispatcherTimer dispatcherTimer = new(); private readonly IWordHighlightingService wordHighlightingService; private CancellationTokenSource? cancellationTokenSource; - private DateTime? lastQueryTime; - private DateTime nextQueryTime = DateTime.Now; public event EventHandler? NameCopyClicked, MessageCopyClicked, TimestampCopyClicked; diff --git a/Daybreak/Daybreak.csproj b/Daybreak/Daybreak.csproj index a89eecc9..9d9ea4d9 100644 --- a/Daybreak/Daybreak.csproj +++ b/Daybreak/Daybreak.csproj @@ -121,7 +121,7 @@ - + diff --git a/Daybreak/Exceptions/CredentialsNotFoundException.cs b/Daybreak/Exceptions/CredentialsNotFoundException.cs index b9656909..2e64f028 100644 --- a/Daybreak/Exceptions/CredentialsNotFoundException.cs +++ b/Daybreak/Exceptions/CredentialsNotFoundException.cs @@ -13,9 +13,6 @@ public CredentialsNotFoundException(string message) : base(message) { } - public CredentialsNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } public CredentialsNotFoundException(string message, Exception innerException) : base(message, innerException) { diff --git a/Daybreak/Exceptions/ExecutableNotFoundException.cs b/Daybreak/Exceptions/ExecutableNotFoundException.cs index 54057795..12c36bea 100644 --- a/Daybreak/Exceptions/ExecutableNotFoundException.cs +++ b/Daybreak/Exceptions/ExecutableNotFoundException.cs @@ -13,9 +13,6 @@ public ExecutableNotFoundException(string message) : base(message) { } - public ExecutableNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } public ExecutableNotFoundException(string message, Exception innerException) : base(message, innerException) { diff --git a/Daybreak/Exceptions/FatalException.cs b/Daybreak/Exceptions/FatalException.cs index a61813f8..529aa03e 100644 --- a/Daybreak/Exceptions/FatalException.cs +++ b/Daybreak/Exceptions/FatalException.cs @@ -13,10 +13,6 @@ public FatalException(string message) : base(message) { } - public FatalException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } - public FatalException(string message, Exception innerException) : base(message, innerException) { } diff --git a/Daybreak/Services/Credentials/CredentialManager.cs b/Daybreak/Services/Credentials/CredentialManager.cs index e03760fd..2ccb8307 100644 --- a/Daybreak/Services/Credentials/CredentialManager.cs +++ b/Daybreak/Services/Credentials/CredentialManager.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Security.Cryptography; using System.Text; +using Convert = System.Convert; namespace Daybreak.Services.Credentials; diff --git a/Daybreak/Services/Graph/GraphClient.cs b/Daybreak/Services/Graph/GraphClient.cs index e7af094f..b28ffd7a 100644 --- a/Daybreak/Services/Graph/GraphClient.cs +++ b/Daybreak/Services/Graph/GraphClient.cs @@ -23,6 +23,7 @@ using System.Threading.Tasks; using System.Web; using System.Windows.Controls; +using Convert = System.Convert; namespace Daybreak.Services.Graph; diff --git a/Daybreak/Services/UBlockOrigin/UBlockOriginService.cs b/Daybreak/Services/UBlockOrigin/UBlockOriginService.cs index ef8a1cf6..733216b9 100644 --- a/Daybreak/Services/UBlockOrigin/UBlockOriginService.cs +++ b/Daybreak/Services/UBlockOrigin/UBlockOriginService.cs @@ -73,7 +73,7 @@ public Task GetExtensionPath() return Task.FromResult(Path.GetFullPath(Path.Combine(InstallationPath, InstallationFolderName))); } - private async Task CheckAndUpdateInternal(string browserVersion) + private async Task CheckAndUpdateInternal(string _) { var scopedLogger = this.logger.CreateScopedLogger(nameof(this.CheckAndUpdateInternal), string.Empty); if (VersionUpToDate) diff --git a/GWCA b/GWCA index 2e2bf319..a0e63274 160000 --- a/GWCA +++ b/GWCA @@ -1 +1 @@ -Subproject commit 2e2bf3192f16e14e4221a63211f22440037bddd1 +Subproject commit a0e63274fce713e44d22bdf15191e605ebee2b4c