Skip to content

Commit 9e241b5

Browse files
committed
Use cancellationToken = default instead of null
1 parent fc43b62 commit 9e241b5

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public interface IManagedNotificationManager : INotificationManager
2121
/// </summary>
2222
/// <param name="content">The content to be displayed.</param>
2323
/// <param name="cancellationToken">The cancellation token.</param>
24-
void Show(object content, CancellationToken? cancellationToken = null);
24+
void Show(object content, CancellationToken cancellationToken = default);
2525

2626
/// <summary>
2727
/// Closes a notification.

src/Avalonia.Controls/Notifications/INotificationManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public interface INotificationManager
1515
/// </summary>
1616
/// <param name="notification">The notification to be displayed.</param>
1717
/// <param name="cancellationToken">The cancellation token.</param>
18-
void Show(INotification notification, CancellationToken? cancellationToken = null);
18+
void Show(INotification notification, CancellationToken cancellationToken = default);
1919

2020
/// <summary>
2121
/// Closes a notification.

src/Avalonia.Controls/Notifications/WindowNotificationManager.cs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
8888
}
8989

9090
/// <inheritdoc/>
91-
public void Show(INotification content, CancellationToken? cancellationToken = null)
91+
public void Show(INotification content, CancellationToken cancellationToken = default)
9292
{
9393
Show(content, content.Type, content.Expiration, content.OnClick, content.OnClose, cancellationToken: cancellationToken);
9494
}
9595

9696
/// <inheritdoc/>
97-
public void Show(object content, CancellationToken? cancellationToken = null)
97+
public void Show(object content, CancellationToken cancellationToken = default)
9898
{
9999
if (content is INotification notification)
100100
{
@@ -122,7 +122,7 @@ public async void Show(object content,
122122
Action? onClick = null,
123123
Action? onClose = null,
124124
string[]? classes = null,
125-
CancellationToken? cancellationToken = null)
125+
CancellationToken cancellationToken = default)
126126
{
127127
Dispatcher.UIThread.VerifyAccess();
128128

@@ -172,15 +172,7 @@ public async void Show(object content,
172172
return;
173173
}
174174

175-
if (cancellationToken is not null)
176-
{
177-
await Task.Delay(expiration ?? TimeSpan.FromSeconds(5), cancellationToken.Value);
178-
}
179-
else
180-
181-
{
182-
await Task.Delay(expiration ?? TimeSpan.FromSeconds(5));
183-
}
175+
await Task.Delay(expiration ?? TimeSpan.FromSeconds(5), cancellationToken);
184176

185177
notificationControl.Close();
186178

0 commit comments

Comments
 (0)