Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ bool filterMenuItemsImpl(string menuItem) => !string.IsNullOrEmpty(menuItem)
}

private static void LoadMenuFlyoutItem(
IList<ContextMenuFlyoutItemViewModel> menuItemsListLocal,
List<ContextMenuFlyoutItemViewModel> menuItemsListLocal,
ContextMenu contextMenu,
IEnumerable<Win32ContextMenuItem> menuFlyoutItems,
CancellationToken cancellationToken,
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Data/Models/ItemViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public sealed class ItemViewModel : ObservableObject, IDisposable
private readonly AsyncManualResetEvent gitChangedEvent;
private readonly DispatcherQueue dispatcherQueue;
private readonly JsonElement defaultJson = JsonSerializer.SerializeToElement("{}");
private readonly IStorageCacheController fileListCache = StorageCacheController.GetInstance();
private readonly StorageCacheController fileListCache = StorageCacheController.GetInstance();
private readonly string folderTypeTextLocalized = "Folder".GetLocalizedResource();

private Task? aProcessQueueAction;
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Services/UpdateService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Files.App.Services
internal sealed class UpdateService : ObservableObject, IUpdateService
{
private StoreContext? _storeContext;
private IList<StorePackageUpdate>? _updatePackages;
private List<StorePackageUpdate>? _updatePackages;

private bool IsMandatory => _updatePackages?.Where(e => e.Mandatory).ToList().Count >= 1;

Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Utils/RecycleBin/RecycleBinManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public sealed class RecycleBinManager
{
private static readonly Lazy<RecycleBinManager> lazy = new(() => new RecycleBinManager());

private IList<SystemIO.FileSystemWatcher>? binWatchers;
private List<SystemIO.FileSystemWatcher>? binWatchers;

public event SystemIO.FileSystemEventHandler? RecycleBinItemCreated;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ public void Order(Func<List<T>, IEnumerable<T>> func)

public void OrderOne(Func<List<T>, IEnumerable<T>> func, T item)
{
IList<T> result;
List<T> result;
lock (syncRoot)
{
result = func.Invoke(collection).ToList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public void Order(Func<List<T>, IEnumerable<T>> func)

public void OrderOne(Func<List<T>, IEnumerable<T>> func, T item)
{
IList<T> result;
List<T> result;

lock (syncRoot)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static class Win32StorageEnumerator

private static readonly string folderTypeTextLocalized = "Folder".GetLocalizedResource();

private static readonly IStorageCacheController fileListCache = StorageCacheController.GetInstance();
private static readonly StorageCacheController fileListCache = StorageCacheController.GetInstance();

public static async Task<List<ListedItem>> ListEntries(
string path,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public sealed class FilesystemHelpers : IFilesystemHelpers

private IShellPage associatedInstance;
private readonly IJumpListService jumpListService;
private IFilesystemOperations filesystemOperations;
private ShellFilesystemOperations filesystemOperations;

private ItemManipulationModel? itemManipulationModel => associatedInstance.SlimContentPage?.ItemManipulationModel;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ private static bool CheckAccess(Stream stream)
return false;
}
}
private static async Task<bool> CheckAccess(IStorageFile file)
private static async Task<bool> CheckAccess(BaseStorageFile file)
{
return await SafetyExtensions.IgnoreExceptions(async () =>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public bool SetCompatibilityOptions()
return WindowsCompatibilityService.SetCompatibilityOptionsForPath(ItemPath, CompatibilityOptions);
}

private Task ExecuteRunTroubleshooterCommand()
private Task<bool> ExecuteRunTroubleshooterCommand()
{
return LaunchHelper.RunCompatibilityTroubleshooterAsync(ItemPath);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/ViewModels/Settings/AboutViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public AboutViewModel()
OpenCrowdinCommand = new AsyncRelayCommand(DoOpenCrowdin);
}

private Task OpenLogLocation()
private Task<bool> OpenLogLocation()
{
return Launcher.LaunchFolderAsync(ApplicationData.Current.LocalFolder).AsTask();
}
Expand Down
6 changes: 3 additions & 3 deletions src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public SidebarViewModel()
ReorderItemsCommand = new AsyncRelayCommand(ReorderItemsAsync);
}

private Task CreateItemHomeAsync()
private Task<LocationItem> CreateItemHomeAsync()
{
return CreateSectionAsync(SectionType.Home);
}
Expand Down Expand Up @@ -379,7 +379,7 @@ await lib.CheckDefaultSaveFolderAccess() &&
else
{
string drivePath = drive.Path;
IList<string> paths = section.ChildItems.Select(item => item.Path).ToList();
var paths = section.ChildItems.Select(item => item.Path).ToList();

if (!paths.Contains(drivePath))
{
Expand Down Expand Up @@ -1276,7 +1276,7 @@ private async Task HandleLocationItemDroppedAsync(LocationItem locationItem, Ite
}
}

private Task HandleDriveItemDroppedAsync(DriveItem driveItem, ItemDroppedEventArgs args)
private Task<ReturnResult> HandleDriveItemDroppedAsync(DriveItem driveItem, ItemDroppedEventArgs args)
{
return FilesystemHelpers.PerformOperationTypeAsync(args.RawEvent.AcceptedOperation, args.RawEvent.DataView, driveItem.Path, false, true);
}
Expand Down