Feature: Added support for Infomaniak kDrive (#16069)

Author: marcofranzen99

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

@@ -41,7 +41,7 @@ private static Task<IEnumerable<ICloudProvider>> DetectYandexDisk()
 			var results = new List<ICloudProvider>();
 			using var yandexKey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Yandex\Yandex.Disk.2");
 
-			var syncedFolder = (string)yandexKey?.GetValue("RootFolder");
+			var syncedFolder = (string?)yandexKey?.GetValue("RootFolder");
 			if (syncedFolder is not null)
 			{
 				results.Add(new CloudProvider(CloudProviders.Yandex)
@@ -59,45 +59,27 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 			var results = new List<ICloudProvider>();
 			using var clsidKey = Registry.ClassesRoot.OpenSubKey(@"CLSID");
 			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() ?? [])
 			{
-				using var clsidSubKey = SafetyExtensions.IgnoreExceptions(() => clsidKey.OpenSubKey(subKeyName));
+				using var clsidSubKey = SafetyExtensions.IgnoreExceptions(() => clsidKey?.OpenSubKey(subKeyName));
 				if (clsidSubKey is not null && (int?)clsidSubKey.GetValue("System.IsPinnedToNameSpaceTree") is 1)
 				{
-					using var namespaceSubKey = namespaceKey.OpenSubKey(subKeyName);
-					var driveType = (string)namespaceSubKey?.GetValue(string.Empty);
-					if (driveType is null)
-					{
+					using var namespaceSubKey = namespaceKey?.OpenSubKey(subKeyName);
+					var driveIdentifier = (string?)namespaceSubKey?.GetValue(string.Empty);
+					if (driveIdentifier is null)
 						continue;
-					}
 
-					//Nextcloud specific
-					var appName = (string)namespaceSubKey?.GetValue("ApplicationName");
-					if (!string.IsNullOrEmpty(appName) && appName == "Nextcloud")
-					{
-						driveType = appName;
-					}
-
-					// Drive specific
-					if (driveType.StartsWith("iCloudDrive"))
-						driveType = "iCloudDrive";
-					if (driveType.StartsWith("iCloudPhotos"))
-						driveType = "iCloudPhotos";
-					if (driveType.StartsWith("ownCloud"))
-						driveType = "ownCloud";
-					if (driveType.StartsWith("ProtonDrive"))
-						driveType = "ProtonDrive";
+					var driveType = GetDriveType(driveIdentifier, namespaceSubKey, syncRootManagerKey);
 
 					using var bagKey = clsidSubKey.OpenSubKey(@"Instance\InitPropertyBag");
-					var syncedFolder = (string)bagKey?.GetValue("TargetFolderPath");
+					var syncedFolder = (string?)bagKey?.GetValue("TargetFolderPath");
 					if (syncedFolder is null)
-					{
 						continue;
-					}
 
 					// Also works for OneDrive, Box, Dropbox
-					CloudProviders? driveID = driveType switch
+					CloudProviders? cloudProvider = driveType switch
 					{
 						"MEGA" => CloudProviders.Mega,
 						"Amazon Drive" => CloudProviders.AmazonDrive,
@@ -108,22 +90,23 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 						"Creative Cloud Files" => CloudProviders.AdobeCreativeCloud,
 						"ownCloud" => CloudProviders.ownCloud,
 						"ProtonDrive" => CloudProviders.ProtonDrive,
+						"kDrive" => CloudProviders.kDrive,
 						_ => null,
 					};
-					if (driveID is null)
-					{
+
+					if (cloudProvider is null)
 						continue;
-					}
 
-					string nextCloudValue = (string)namespaceSubKey?.GetValue(string.Empty);
-					string ownCloudValue = (string)clsidSubKey?.GetValue(string.Empty);
+					var nextCloudValue = (string?)namespaceSubKey?.GetValue(string.Empty);
+					var ownCloudValue = (string?)clsidSubKey?.GetValue(string.Empty);
+					var kDriveValue = (string?)clsidSubKey?.GetValue(string.Empty);
 
-					using var defaultIconKey = clsidSubKey.OpenSubKey(@"DefaultIcon");
-					string iconPath = (string)defaultIconKey?.GetValue(string.Empty);
+					using var defaultIconKey = clsidSubKey?.OpenSubKey(@"DefaultIcon");
+					var iconPath = (string?)defaultIconKey?.GetValue(string.Empty);
 
-					results.Add(new CloudProvider(driveID.Value)
+					results.Add(new CloudProvider(cloudProvider.Value)
 					{
-						Name = driveID switch
+						Name = cloudProvider switch
 						{
 							CloudProviders.Mega => $"MEGA ({Path.GetFileName(syncedFolder.TrimEnd('\\'))})",
 							CloudProviders.AmazonDrive => $"Amazon Drive",
@@ -134,10 +117,11 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 							CloudProviders.AdobeCreativeCloud => $"Creative Cloud Files",
 							CloudProviders.ownCloud => !string.IsNullOrEmpty(ownCloudValue) ? ownCloudValue : "ownCloud",
 							CloudProviders.ProtonDrive => $"Proton Drive",
+							CloudProviders.kDrive => !string.IsNullOrEmpty(kDriveValue) ? kDriveValue : "kDrive",
 							_ => null
 						},
 						SyncFolder = syncedFolder,
-						IconData = driveID switch
+						IconData = cloudProvider switch
 						{
 							CloudProviders.ProtonDrive => Win32Helper.ExtractSelectedIconsFromDLL(iconPath, new List<int>() { 32512 }).FirstOrDefault()?.IconData,
 							_ => null
@@ -161,8 +145,8 @@ private static Task<IEnumerable<ICloudProvider>> DetectOneDrive()
 			foreach (var account in oneDriveAccountsKey.GetSubKeyNames())
 			{
 				var accountKeyName = @$"{oneDriveAccountsKey.Name}\{account}";
-				var displayName = (string)Registry.GetValue(accountKeyName, "DisplayName", null);
-				var userFolder = (string)Registry.GetValue(accountKeyName, "UserFolder", null);
+				var displayName = (string?)Registry.GetValue(accountKeyName, "DisplayName", null);
+				var userFolder = (string?)Registry.GetValue(accountKeyName, "UserFolder", null);
 				var accountName = string.IsNullOrWhiteSpace(displayName) ? "OneDrive" : $"OneDrive - {displayName}";
 
 				if (!string.IsNullOrWhiteSpace(userFolder) && !oneDriveAccounts.Any(x => x.Name == accountName))
@@ -241,7 +225,7 @@ private static Task<IEnumerable<ICloudProvider>> DetectpCloudDrive()
 			var results = new List<ICloudProvider>();
 			using var pCloudDriveKey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\pCloud");
 
-			var syncedFolder = (string)pCloudDriveKey?.GetValue("SyncDrive");
+			var syncedFolder = (string?)pCloudDriveKey?.GetValue("SyncDrive");
 			if (syncedFolder is not null)
 			{
 				string iconPath = Path.Combine(programFilesFolder, "pCloud Drive", "pCloud.exe");
@@ -301,7 +285,7 @@ private static Task<IEnumerable<ICloudProvider>> DetectSeadriveDrive()
 			var results = new List<ICloudProvider>();
 			using var SeadriveKey = Registry.CurrentUser.OpenSubKey(@"Software\SeaDrive\Seafile Drive Client\Settings");
 
-			var syncFolder = (string)SeadriveKey?.GetValue("seadriveRoot");
+			var syncFolder = (string?)SeadriveKey?.GetValue("seadriveRoot");
 			if (SeadriveKey is not null)
 			{
 				string iconPath = Path.Combine(programFilesFolder, "SeaDrive", "bin", "seadrive.exe");
@@ -345,5 +329,32 @@ private static Task<IEnumerable<ICloudProvider>> DetectAutodeskDrive()
 
 			return Task.FromResult<IEnumerable<ICloudProvider>>(results);
 		}
+
+		private static string GetDriveType(string driveIdentifier, RegistryKey? namespaceSubKey, RegistryKey? syncRootManagerKey)
+		{
+			// Drive specific
+			if (driveIdentifier.StartsWith("iCloudDrive"))
+				return "iCloudDrive";
+			if (driveIdentifier.StartsWith("iCloudPhotos"))
+				return "iCloudPhotos";
+			if (driveIdentifier.StartsWith("ownCloud"))
+				return "ownCloud";
+			if (driveIdentifier.StartsWith("ProtonDrive"))
+				return "ProtonDrive";
+
+			// Nextcloud specific
+			var appNameFromNamespace = (string?)namespaceSubKey?.GetValue("ApplicationName");
+			if (!string.IsNullOrEmpty(appNameFromNamespace) && appNameFromNamespace == "Nextcloud")
+				return appNameFromNamespace;
+
+			// kDrive specific
+			var appNameFromSyncRoot = (string?)syncRootManagerKey?.OpenSubKey(driveIdentifier)?.GetValue(string.Empty);
+			if (!string.IsNullOrEmpty(appNameFromNamespace) && appNameFromNamespace == "kDrive")
+				return appNameFromNamespace;
+			if (!string.IsNullOrEmpty(appNameFromSyncRoot) && appNameFromSyncRoot == "kDrive")
+				return appNameFromSyncRoot;
+
+			return driveIdentifier;
+		}
 	}
 }

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

@@ -45,6 +45,8 @@ public enum CloudProviders
 
 		ProtonDrive,
 
-		LucidLink
+		LucidLink,
+
+		kDrive
 	}
 }