From 55c035323bebeac03dffe648bdad62c6d44d6ec2 Mon Sep 17 00:00:00 2001 From: softworkz Date: Mon, 17 Nov 2025 13:58:22 +0100 Subject: [PATCH] Use non-generic TaskCompletionSource where applicable --- src/ElectronNET.API/API/Dialog.cs | 4 ++-- src/ElectronNET.API/API/Session.cs | 28 +++++++++++++------------- src/ElectronNET.API/API/WebContents.cs | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ElectronNET.API/API/Dialog.cs b/src/ElectronNET.API/API/Dialog.cs index 2181646..3b9739d 100644 --- a/src/ElectronNET.API/API/Dialog.cs +++ b/src/ElectronNET.API/API/Dialog.cs @@ -206,10 +206,10 @@ namespace ElectronNET.API [SupportedOSPlatform("Windows")] public Task ShowCertificateTrustDialogAsync(BrowserWindow browserWindow, CertificateTrustDialogOptions options) { - var tcs = new TaskCompletionSource(); + var tcs = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.Once("showCertificateTrustDialogComplete" + guid, () => tcs.SetResult(null)); + BridgeConnector.Socket.Once("showCertificateTrustDialogComplete" + guid, () => tcs.SetResult()); BridgeConnector.Socket.Emit("showCertificateTrustDialog", browserWindow, options, diff --git a/src/ElectronNET.API/API/Session.cs b/src/ElectronNET.API/API/Session.cs index ef3b44d..a7459cb 100644 --- a/src/ElectronNET.API/API/Session.cs +++ b/src/ElectronNET.API/API/Session.cs @@ -47,10 +47,10 @@ namespace ElectronNET.API /// public Task ClearAuthCacheAsync(RemovePassword options) { - var tcs = new TaskCompletionSource(); + var tcs = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.Once("webContents-session-clearAuthCache-completed" + guid, () => tcs.SetResult(null)); + BridgeConnector.Socket.Once("webContents-session-clearAuthCache-completed" + guid, () => tcs.SetResult()); BridgeConnector.Socket.Emit("webContents-session-clearAuthCache", Id, options, guid); return tcs.Task; @@ -61,10 +61,10 @@ namespace ElectronNET.API /// public Task ClearAuthCacheAsync() { - var tcs = new TaskCompletionSource(); + var tcs = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.Once("webContents-session-clearAuthCache-completed" + guid, () => tcs.SetResult(null)); + BridgeConnector.Socket.Once("webContents-session-clearAuthCache-completed" + guid, () => tcs.SetResult()); BridgeConnector.Socket.Emit("webContents-session-clearAuthCache", Id, guid); return tcs.Task; @@ -76,10 +76,10 @@ namespace ElectronNET.API /// public Task ClearCacheAsync() { - var tcs = new TaskCompletionSource(); + var tcs = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.Once("webContents-session-clearCache-completed" + guid, () => tcs.SetResult(null)); + BridgeConnector.Socket.Once("webContents-session-clearCache-completed" + guid, () => tcs.SetResult()); BridgeConnector.Socket.Emit("webContents-session-clearCache", Id, guid); return tcs.Task; @@ -91,10 +91,10 @@ namespace ElectronNET.API /// public Task ClearHostResolverCacheAsync() { - var tcs = new TaskCompletionSource(); + var tcs = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.Once("webContents-session-clearHostResolverCache-completed" + guid, () => tcs.SetResult(null)); + BridgeConnector.Socket.Once("webContents-session-clearHostResolverCache-completed" + guid, () => tcs.SetResult()); BridgeConnector.Socket.Emit("webContents-session-clearHostResolverCache", Id, guid); return tcs.Task; @@ -106,10 +106,10 @@ namespace ElectronNET.API /// public Task ClearStorageDataAsync() { - var tcs = new TaskCompletionSource(); + var tcs = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.Once("webContents-session-clearStorageData-completed" + guid, () => tcs.SetResult(null)); + BridgeConnector.Socket.Once("webContents-session-clearStorageData-completed" + guid, () => tcs.SetResult()); BridgeConnector.Socket.Emit("webContents-session-clearStorageData", Id, guid); return tcs.Task; @@ -122,10 +122,10 @@ namespace ElectronNET.API /// public Task ClearStorageDataAsync(ClearStorageDataOptions options) { - var tcs = new TaskCompletionSource(); + var tcs = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.Once("webContents-session-clearStorageData-options-completed" + guid, () => tcs.SetResult(null)); + BridgeConnector.Socket.Once("webContents-session-clearStorageData-options-completed" + guid, () => tcs.SetResult()); BridgeConnector.Socket.Emit("webContents-session-clearStorageData-options", Id, options, guid); return tcs.Task; @@ -276,10 +276,10 @@ namespace ElectronNET.API /// public Task SetProxyAsync(ProxyConfig config) { - var tcs = new TaskCompletionSource(); + var tcs = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.Once("webContents-session-setProxy-completed" + guid, () => tcs.SetResult(null)); + BridgeConnector.Socket.Once("webContents-session-setProxy-completed" + guid, () => tcs.SetResult()); BridgeConnector.Socket.Emit("webContents-session-setProxy", Id, config, guid); return tcs.Task; diff --git a/src/ElectronNET.API/API/WebContents.cs b/src/ElectronNET.API/API/WebContents.cs index 2ded9f6..fb95876 100644 --- a/src/ElectronNET.API/API/WebContents.cs +++ b/src/ElectronNET.API/API/WebContents.cs @@ -254,12 +254,12 @@ public class WebContents : ApiBase /// public Task LoadURLAsync(string url, LoadURLOptions options) { - var tcs = new TaskCompletionSource(); + var tcs = new TaskCompletionSource(); BridgeConnector.Socket.Once("webContents-loadURL-complete" + Id, () => { BridgeConnector.Socket.Off("webContents-loadURL-error" + Id); - tcs.SetResult(null); + tcs.SetResult(); }); BridgeConnector.Socket.Once("webContents-loadURL-error" + Id, (error) => { tcs.SetException(new InvalidOperationException(error)); });