Disposing cancellation tokens

rithik-b · Mar 17, 2022 · 810d84c · 810d84c
1 parent 4135952
commit 810d84c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/MorePlaylists/UI/ViewControllers/IListViewController.cs b/MorePlaylists/UI/ViewControllers/IListViewController.cs
@@ -8,8 +8,8 @@ namespace MorePlaylists.UI;
 public interface IListViewController
 {
     ViewController ViewController { get; }
-    event Action<IEntry> DidSelectPlaylist;
-    event Action DidClickSource;
+    event Action<IEntry>? DidSelectPlaylist;
+    event Action? DidClickSource;
     void ShowPlaylistsForSource(ISource source);
     void SetEntryAsOwned(IEntry entry);
     void AbortLoading();

diff --git a/MorePlaylists/UI/ViewControllers/MorePlaylistsListViewController.cs b/MorePlaylists/UI/ViewControllers/MorePlaylistsListViewController.cs
@@ -56,6 +56,7 @@ protected override void DidActivate(bool firstActivation, bool addedToHierarchy,
                 sourceButton.image.sprite = currentSource.Logo;
                 inputFieldView.ClearInput();
                 loadCancellationTokenSource?.Cancel();
+                loadCancellationTokenSource?.Dispose();
                 loadCancellationTokenSource = new CancellationTokenSource();
                 _ = LoadPlaylists(currentSource, loadCancellationTokenSource.Token);
             }
@@ -89,6 +90,7 @@ private void PostParse()
             inputFieldView.onValueChanged.AddListener(inputFieldView =>
             {
                 searchCancellationTokenSource?.Cancel();
+                searchCancellationTokenSource?.Dispose();
                 searchCancellationTokenSource = new CancellationTokenSource();
                 _ = SearchAsync(searchCancellationTokenSource.Token);
             });
@@ -103,6 +105,9 @@ private void PostParse()
         public void AbortLoading()
         {
             loadCancellationTokenSource?.Cancel();
+            loadCancellationTokenSource?.Dispose();
+            searchCancellationTokenSource?.Cancel();
+            searchCancellationTokenSource?.Dispose();
             Loaded = true;
         }
 

diff --git a/MorePlaylists/UI/ViewControllers/MorePlaylistsSongListViewController.cs b/MorePlaylists/UI/ViewControllers/MorePlaylistsSongListViewController.cs
@@ -45,6 +45,7 @@ public void SetCurrentPlaylist(IEntry entry)
             }
 
             cancellationTokenSource?.Cancel();
+            cancellationTokenSource?.Dispose();
             cancellationTokenSource = new CancellationTokenSource();
 
             _ = InitSongList(entry, cancellationTokenSource.Token);