Skip to content

Code Quality: Handle exceptions when accessing Google Drive paths #17464

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
Aug 18, 2025
Merged

Code Quality: Handle exceptions when accessing Google Drive paths #17464

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b3dc23
Reliability: Handle exceptions when accessing Google Drive paths
seer-by-sentry[bot] Aug 18, 2025
46ce5a3
Update GoogleDriveCloudDetector.cs
yaira2 Aug 18, 2025
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
21 changes: 18 additions & 3 deletions src/Files.App/Utils/Cloud/Detector/GoogleDriveCloudDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,14 @@ await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(Path.Combine(a
path = path.Substring(@"\\?\".Length);
}

var folder = await StorageFolder.GetFolderFromPathAsync(path);
var folderResult = await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(path).AsTask());
if (!folderResult)
{
_logger.LogWarning($"Could not access Google Drive path as local storage: {path}");
continue;
}

var folder = folderResult.Result;
string title = reader["title"]?.ToString() ?? folder.Name;

Debug.WriteLine("YIELD RETURNING from `GoogleDriveCloudDetector.GetProviders()` (roots): ");
Expand All @@ -89,7 +96,14 @@ await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(Path.Combine(a
if (!AddMyDriveToPathAndValidate(ref path))
continue;

var folder = await StorageFolder.GetFolderFromPathAsync(path);
var folderResult = await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(path).AsTask());
if (!folderResult)
{
_logger.LogWarning($"Could not access Google Drive path as local storage: {path}");
continue;
}

var folder = folderResult.Result;
string title = reader["name"]?.ToString() ?? folder.Name;

Debug.WriteLine("YIELD RETURNING from `GoogleDriveCloudDetector.GetProviders` (media): ");
Expand Down Expand Up @@ -269,7 +283,8 @@ private static bool ValidatePath(string path)

var iconPath = Path.Combine(programFilesEnvVar, "Google", "Drive File Stream", "drive_fs.ico");

return await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(iconPath).AsTask());
var iconFileResult = await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(iconPath).AsTask());
return iconFileResult ? iconFileResult.Result : null;
}

private static bool AddMyDriveToPathAndValidate(ref string path)
Expand Down
Loading