Skip to content

Commit 8cd0b11

Browse files
authored
Couple of suggested changes (#13757)
1 parent f6ea42e commit 8cd0b11

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

src/Files.App/Data/Items/ListedItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ public void UpdateContainsFilesFolders()
402402
private bool CheckElevationRights()
403403
{
404404
// Avoid downloading file to check elevation
405-
if (SyncStatusUI.SyncStatus == CloudDriveSyncStatus.FileOnline)
405+
if (SyncStatusUI.SyncStatus is CloudDriveSyncStatus.FileOnline or CloudDriveSyncStatus.FolderOnline)
406406
return false;
407407

408408
return IsShortcut

src/Files.App/ViewModels/Properties/HashesViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private void ToggleIsEnabled(string? algorithm)
6969
}
7070

7171
// Don't calculate hashes for online files
72-
if (_item.SyncStatusUI.SyncStatus == CloudDriveSyncStatus.FileOnline)
72+
if (_item.SyncStatusUI.SyncStatus is CloudDriveSyncStatus.FileOnline or CloudDriveSyncStatus.FolderOnline)
7373
{
7474
hashInfoItem.HashValue = "CalculationOnlineFileHashError".GetLocalizedResource();
7575
return;

src/Files.App/ViewModels/Properties/Items/FileProperties.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public override async Task GetSpecialPropertiesAsync()
9999
ViewModel.ItemSize = Item.FileSizeBytes.ToLongSizeString();
100100

101101
// Only load the size for items on the device
102-
if (Item.SyncStatusUI.SyncStatus != CloudDriveSyncStatus.FileOnline)
102+
if (Item.SyncStatusUI.SyncStatus is not CloudDriveSyncStatus.FileOnline and not CloudDriveSyncStatus.FolderOnline)
103103
ViewModel.ItemSizeOnDisk = NativeFileOperationsHelper.GetFileSizeOnDisk(Item.ItemPath)?.ToLongSizeString() ??
104104
string.Empty;
105105

src/Files.App/ViewModels/Properties/Items/FolderProperties.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,9 @@ public async override Task GetSpecialPropertiesAsync()
8888
ViewModel.ItemSize = Item.FileSizeBytes.ToLongSizeString();
8989

9090
// Only load the size for items on the device
91-
if (Item.SyncStatusUI.SyncStatus != CloudDriveSyncStatus.FileOnline)
92-
{
93-
var sizeOnDisk = NativeFileOperationsHelper.GetFileSizeOnDisk(Item.ItemPath);
94-
if (sizeOnDisk is not null)
95-
ViewModel.ItemSizeOnDisk = ((long)sizeOnDisk).ToLongSizeString();
96-
}
91+
if (Item.SyncStatusUI.SyncStatus is not CloudDriveSyncStatus.FileOnline and not CloudDriveSyncStatus.FolderOnline)
92+
ViewModel.ItemSizeOnDisk = NativeFileOperationsHelper.GetFileSizeOnDisk(Item.ItemPath)?.ToLongSizeString() ??
93+
string.Empty;
9794

9895
ViewModel.ItemCreatedTimestampReal = Item.ItemDateCreatedReal;
9996
ViewModel.ItemAccessedTimestampReal = Item.ItemDateAccessedReal;

0 commit comments

Comments
 (0)