address issue #16149

Address the following issue:

#16149

Avoid skipping detection of a drive named G that is not Google Drive when the
registry contains old keys for Google Drive.

Add "My Drive" to the Google Drive registry path in RemovableDrivesService and
check if it's valid.

Then DON'T skip the found "G" drive if the "My Drive" path is NOT valid.

Author: wharvex

src/Files.App/Services/Storage/StorageDevicesService.cs

@@ -25,25 +25,27 @@ public async IAsyncEnumerable<ILocatableFolder> GetDrivesAsync()
 			var googleDrivePath = GoogleDriveCloudDetector.GetRegistryBasePath();
 			sw.Stop();
 			Debug.WriteLine($"In RemovableDrivesService: Time elapsed for registry check: {sw.Elapsed}");
-			App.AppModel.GoogleDrivePath = googleDrivePath ?? string.Empty;
+			var googleDrivePathWithMyDrive = googleDrivePath ?? string.Empty;
+			var gdPathIsValid = GoogleDriveCloudDetector.AddMyDriveToPathAndValidate(ref googleDrivePathWithMyDrive);
+			App.AppModel.GoogleDrivePath = gdPathIsValid ? googleDrivePathWithMyDrive : string.Empty;
 
 			foreach (var drive in list)
 			{
 				// We don't want cloud drives to appear in a plain "Drives" section.
-				if (drive.Name.Equals(googleDrivePath) || drive.Name.Equals(pCloudDrivePath))
+				if ((gdPathIsValid && drive.Name.Equals(googleDrivePath)) || drive.Name.Equals(pCloudDrivePath))
 					continue;
 
 				var res = await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(drive.Name).AsTask());
 				if (res.ErrorCode is FileSystemStatusCode.Unauthorized)
 				{
 					App.Logger.LogWarning($"{res.ErrorCode}: Attempting to add the device, {drive.Name},"
-						+ " failed at the StorageFolder initialization step. This device will be ignored.");
+					                      + " failed at the StorageFolder initialization step. This device will be ignored.");
 					continue;
 				}
 				else if (!res)
 				{
 					App.Logger.LogWarning($"{res.ErrorCode}: Attempting to add the device, {drive.Name},"
-						+ " failed at the StorageFolder initialization step. This device will be ignored.");
+					                      + " failed at the StorageFolder initialization step. This device will be ignored.");
 					continue;
 				}
 

src/Files.App/Utils/Cloud/Detector/GoogleDriveCloudDetector.cs

@@ -108,7 +108,7 @@ await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(Path.Combine(a
 			await Inspect(database, "SELECT name FROM sqlite_master WHERE type = 'table' ORDER BY 1", "root_preferences db, all tables");
 
 			var registryPath = App.AppModel.GoogleDrivePath;
-			if (!AddMyDriveToPathAndValidate(ref registryPath))
+			if (registryPath.Equals(string.Empty))
 				yield break;
 			yield return new CloudProvider(CloudProviders.GoogleDrive)
 			{
@@ -258,7 +258,7 @@ private static bool ValidatePath(string path)
 			return await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(iconPath).AsTask());
 		}
 
-		private static bool AddMyDriveToPathAndValidate(ref string path)
+		public static bool AddMyDriveToPathAndValidate(ref string path)
 		{ 
 			// If `path` contains a shortcut named "My Drive", store its target in `shellFolderBaseFirst`.
 			// This happens when "My Drive syncing options" is set to "Mirror files".