Skip to content

Fix SyncUI not being updated #6248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2021
Merged

Fix SyncUI not being updated #6248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cced370
Fix SyncUI not updated
hez2010 Sep 28, 2021
25d692b
Normalize null check
hez2010 Sep 28, 2021
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
14 changes: 7 additions & 7 deletions Files/ViewModels/ItemViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2053,7 +2053,7 @@ private async Task AddFileOrFolderAsync(string fileOrFolderPath, string dateRetu
await AddFileOrFolderAsync(listedItem);
}

private async Task<(ListedItem Item, CloudDriveSyncStatusUI SyncUI, long? Size, DateTimeOffset Created, DateTimeOffset Modified)?> GetFileOrFolderUpdateInfoAsync(ListedItem item, bool hasSyncStatus)
private async Task<(ListedItem Item, CloudDriveSyncStatus? SyncStatus, long? Size, DateTimeOffset Created, DateTimeOffset Modified)?> GetFileOrFolderUpdateInfoAsync(ListedItem item, bool hasSyncStatus)
{
IStorageItem storageItem = null;
if (item.PrimaryItemAttribute == StorageItemTypes.File)
Expand All @@ -2066,7 +2066,7 @@ private async Task AddFileOrFolderAsync(string fileOrFolderPath, string dateRetu
}
if (storageItem != null)
{
CloudDriveSyncStatusUI syncUI = hasSyncStatus ? CloudDriveSyncStatusUI.FromCloudDriveSyncStatus(await CheckCloudDriveSyncStatusAsync(storageItem)) : null;
CloudDriveSyncStatus? syncStatus = hasSyncStatus ? await CheckCloudDriveSyncStatusAsync(storageItem) : null;
long? size = null;
DateTimeOffset created = default, modified = default;

Expand All @@ -2084,7 +2084,7 @@ private async Task AddFileOrFolderAsync(string fileOrFolderPath, string dateRetu
created = properties.ItemDate;
}

return (item, syncUI, size, created, modified);
return (item, syncStatus, size, created, modified);
}

return null;
Expand All @@ -2110,18 +2110,18 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>
{
foreach (var result in results)
{
if (result.HasValue)
if (result != null)
{
var item = result.Value.Item;
item.ItemDateModifiedReal = result.Value.Modified;
item.ItemDateCreatedReal = result.Value.Created;

if (result.Value.SyncUI != null)
if (result.Value.SyncStatus != null)
{
item.SyncStatusUI = result.Value.SyncUI;
item.SyncStatusUI = CloudDriveSyncStatusUI.FromCloudDriveSyncStatus(result.Value.SyncStatus.Value);
}

if (result.Value.Size.HasValue)
if (result.Value.Size != null)
{
item.FileSizeBytes = result.Value.Size.Value;
item.FileSize = ByteSizeLib.ByteSize.FromBytes(item.FileSizeBytes).ToBinaryString().ConvertSizeAbbreviation();
Expand Down