Update

Author: 0x5bfa

Diff for: src/Files.App.Storage/Watchers/RecycleBinWatcher.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Extensions;
 using System.Security.Principal;
 
 namespace Files.App.Storage.Watchers
@@ -15,9 +16,6 @@ public class RecycleBinWatcher : ITrashWatcher
 		/// <inheritdoc/>
 		public event EventHandler<SystemIO.FileSystemEventArgs>? ItemDeleted;
 
-		/// <inheritdoc/>
-		public event EventHandler<SystemIO.FileSystemEventArgs>? ItemChanged;
-
 		/// <inheritdoc/>
 		public event EventHandler<SystemIO.FileSystemEventArgs>? ItemRenamed;
 
@@ -35,16 +33,13 @@ public RecycleBinWatcher()
 		/// <inheritdoc/>
 		public void StartWatcher()
 		{
-			// NOTE:
-			//  SHChangeNotifyRegister only works if recycle bin is open in File Explorer.
-			//  Create file system watcher to monitor recycle bin folder(s) instead.
+			// NOTE: SHChangeNotifyRegister only works if recycle bin is open in File Explorer.
 
 			// Listen changes only on the Recycle Bin that the current logon user has
 			var sid = WindowsIdentity.GetCurrent().User?.ToString() ?? string.Empty;
 			if (string.IsNullOrEmpty(sid))
 				return;
 
-			// TODO: Use IStorageDevicesService to enumerate drives
 			foreach (var drive in SystemIO.DriveInfo.GetDrives())
 			{
 				var recyclePath = SystemIO.Path.Combine(drive.Name, "$RECYCLE.BIN", sid);
@@ -53,7 +48,7 @@ public void StartWatcher()
 					!SystemIO.Directory.Exists(recyclePath))
 					continue;
 
-				// NOTE: Supress #15808
+				// NOTE: Suppressed NullReferenceException caused by EnableRaisingEvents in #15808
 				SafetyExtensions.IgnoreExceptions(() =>
 				{
 					SystemIO.FileSystemWatcher watcher = new()

Diff for: src/Files.Core.Storage/Contracts/ITrashWatcher.cs

@@ -15,11 +15,6 @@ public interface ITrashWatcher : IWatcher
 		/// </summary>
 		event EventHandler<SystemIO.FileSystemEventArgs>? ItemDeleted;
 
-		/// <summary>
-		/// Gets invoked when an item changing is detected by the watcher
-		/// </summary>
-		event EventHandler<SystemIO.FileSystemEventArgs>? ItemChanged;
-
 		/// <summary>
 		/// Gets invoked when an item renaming is detected by the watcher
 		/// </summary>