integrated lucid link cloud drive detection into the method DetectGenericCloudDrive

Author: marcofranzen99

src/Files.App/Utils/Cloud/CloudDrivesDetector.cs

@@ -61,7 +61,9 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 			using var namespaceKey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace");
 			using var syncRootManagerKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\SyncRootManager");
 
-			foreach (var subKeyName in namespaceKey?.GetSubKeyNames() ?? [])
+			var namespaceKeys = namespaceKey?.GetSubKeyNames() ?? [];
+
+			foreach (var subKeyName in namespaceKeys)
 			{
 				using var clsidSubKey = SafetyExtensions.IgnoreExceptions(() => clsidKey?.OpenSubKey(subKeyName));
 				if (clsidSubKey is not null && (int?)clsidSubKey.GetValue("System.IsPinnedToNameSpaceTree") is 1)
@@ -90,6 +92,7 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 						"ownCloud" => CloudProviders.ownCloud,
 						"ProtonDrive" => CloudProviders.ProtonDrive,
 						"kDrive" => CloudProviders.kDrive,
+						"Lucid" => CloudProviders.LucidLink,
 						_ => null,
 					};
 
@@ -99,6 +102,7 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 					var nextCloudValue = (string?)namespaceSubKey?.GetValue(string.Empty);
 					var ownCloudValue = (string?)clsidSubKey?.GetValue(string.Empty);
 					var kDriveValue = (string?)clsidSubKey?.GetValue(string.Empty);
+					var lucidLinkValue = (string?)clsidSubKey?.GetValue(string.Empty);
 
 					using var defaultIconKey = clsidSubKey?.OpenSubKey(@"DefaultIcon");
 					var iconPath = (string?)defaultIconKey?.GetValue(string.Empty);
@@ -116,21 +120,29 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 							CloudProviders.ownCloud => !string.IsNullOrEmpty(ownCloudValue) ? ownCloudValue : "ownCloud",
 							CloudProviders.ProtonDrive => $"Proton Drive",
 							CloudProviders.kDrive => !string.IsNullOrEmpty(kDriveValue) ? kDriveValue : "kDrive",
+							CloudProviders.LucidLink => !string.IsNullOrEmpty(lucidLinkValue) ? lucidLinkValue : "lucidLink",
 							_ => null
 						},
 						SyncFolder = syncedFolder,
-						IconData = cloudProvider switch
-						{
-							CloudProviders.ProtonDrive => Win32Helper.ExtractSelectedIconsFromDLL(iconPath, new List<int>() { 32512 }).FirstOrDefault()?.IconData,
-							_ => null
-						}
+						IconData = GetIconData(iconPath)
 					});
 				}
 			}
 
 			return Task.FromResult<IEnumerable<ICloudProvider>>(results);
 		}
 
+		private static byte[]? GetIconData(string iconPath)
+		{
+			if (string.IsNullOrEmpty(iconPath) || !File.Exists(iconPath))
+				return null;
+
+			if (iconPath.EndsWith(".dll") || iconPath.EndsWith(".exe"))
+				return Win32Helper.ExtractSelectedIconsFromDLL(iconPath, new List<int>() { 32512 }).FirstOrDefault()?.IconData;
+
+			return File.ReadAllBytes(iconPath);
+		}
+
 		private static Task<IEnumerable<ICloudProvider>> DetectOneDrive()
 		{
 			using var oneDriveAccountsKey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\OneDrive\Accounts");

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

@@ -33,7 +33,6 @@ private static IEnumerable<ICloudDetector> EnumerateDetectors()
 			yield return new BoxCloudDetector();
 			yield return new GenericCloudDetector();
 			yield return new SynologyDriveCloudDetector();
-			yield return new LucidLinkCloudDetector();
 		}
 	}
 }