Fix: Fixed network locations not appearing on the sidebar (#12411)

Author: gave92

src/Files.App/Data/Models/NetworkDrivesViewModel.cs

@@ -48,17 +48,17 @@ public NetworkDrivesViewModel(INetworkDrivesService networkDrivesService)
 		public async Task UpdateDrivesAsync()
 		{
 			var unsortedDrives = new List<ILocatableFolder>();
-			Drives.Clear();
-
+			unsortedDrives.Add(drives.Single(x => x is DriveItem o && o.DeviceID == "network-folder"));
 			await foreach (ILocatableFolder item in networkDrivesService.GetDrivesAsync())
 			{
 				unsortedDrives.Add(item);
 			}
 
 			var orderedDrives = unsortedDrives.Cast<DriveItem>()
-				.OrderByDescending(o => string.Equals(o.Text, "Network".GetLocalizedResource(), StringComparison.OrdinalIgnoreCase))
+				.OrderByDescending(o => o.DeviceID == "network-folder")
 				.ThenBy(o => o.Text);
 
+			Drives.Clear();
 			foreach (ILocatableFolder item in orderedDrives)
 			{
 				Drives.AddIfNotPresent(item);

src/Files.App/Filesystem/Cloud/CloudDrivesManager.cs

@@ -12,7 +12,7 @@ public class CloudDrivesManager
 	{
 		private readonly ILogger _logger = Ioc.Default.GetRequiredService<ILogger<App>>();
 
-		private readonly ICloudDetector _detector = Ioc.Default.GetService<ICloudDetector>();
+		private readonly ICloudDetector _detector = Ioc.Default.GetRequiredService<ICloudDetector>();
 
 		public EventHandler<NotifyCollectionChangedEventArgs> DataChanged;
 
@@ -30,7 +30,7 @@ public IReadOnlyList<DriveItem> Drives
 
 		public async Task UpdateDrivesAsync()
 		{
-			var providers = await _detector?.DetectCloudProvidersAsync();
+			var providers = await _detector.DetectCloudProvidersAsync();
 			if (providers is null)
 				return;
 

src/Files.App/Helpers/FtpHelpers.cs

@@ -67,13 +67,9 @@ public static ushort GetFtpPort(string path)
 		public static string GetFtpAuthority(string path)
 		{
 			path = path.Replace("\\", "/", StringComparison.Ordinal);
-			var schemaIndex = path.IndexOf("://", StringComparison.Ordinal) + 3;
-			var hostIndex = path.IndexOf("/", schemaIndex, StringComparison.Ordinal);
-
-			if (hostIndex == -1)
-				hostIndex = path.Length;
-
-			return path.Substring(schemaIndex, hostIndex - schemaIndex);
+			if (Uri.TryCreate(path, UriKind.Absolute, out var uri))
+				return uri.Authority;
+			return string.Empty;
 		}
 
 		public static string GetFtpPath(string path)

src/Files.App/ViewModels/MainPageViewModel.cs

@@ -38,7 +38,7 @@ public TabItem? SelectedTabItem
 		public IAsyncRelayCommand OpenNewWindowAcceleratorCommand { get; private set; }
 
 		public MainPageViewModel(
-			IUserSettingsService userSettings, 
+			IUserSettingsService userSettings,
 			IAppearanceSettingsService appearanceSettings,
 			IResourcesService resources,
 			DrivesViewModel drivesViewModel,
@@ -267,9 +267,6 @@ public async Task OnNavigatedTo(NavigationEventArgs e)
 			if (e.NavigationMode == NavigationMode.Back)
 				return;
 
-			if (drivesViewModel.Drives.Count == 0)
-				await drivesViewModel.UpdateDrivesAsync();
-
 			//Initialize the static theme helper to capture a reference to this window
 			//to handle theme changes without restarting the app
 			ThemeHelper.Initialize();
@@ -368,6 +365,10 @@ public async Task OnNavigatedTo(NavigationEventArgs e)
 
 			// Load the app theme resources
 			resourcesService.LoadAppResources(appearanceSettingsService);
+
+			await Task.WhenAll(
+				drivesViewModel.UpdateDrivesAsync(),
+				networkDrivesViewModel.UpdateDrivesAsync());
 		}
 
 		public Task AddNewTabAsync()

src/Files.App/ViewModels/UserControls/SidebarViewModel.cs

@@ -332,16 +332,28 @@ await lib.CheckDefaultSaveFolderAccess() &&
 			}
 			else if (elem is DriveItem drive)
 			{
-				string drivePath = drive.Path;
-				IList<string> paths = section.ChildItems.Select(item => item.Path).ToList();
-
-				if (!paths.Contains(drivePath))
+				if (section.Section is SectionType.Network or SectionType.CloudDrives)
+				{
+					// Already sorted
+					if (!section.ChildItems.Any(x => x.Path == drive.Path))
+					{
+						section.ChildItems.Insert(index < 0 ? section.ChildItems.Count : Math.Min(index, section.ChildItems.Count), drive);
+						await drive.LoadThumbnailAsync(true);
+					}
+				}
+				else
 				{
-					paths.AddSorted(drivePath);
-					int position = paths.IndexOf(drivePath);
+					string drivePath = drive.Path;
+					IList<string> paths = section.ChildItems.Select(item => item.Path).ToList();
+
+					if (!paths.Contains(drivePath))
+					{
+						paths.AddSorted(drivePath);
+						int position = paths.IndexOf(drivePath);
 
-					section.ChildItems.Insert(position, drive);
-					await drive.LoadThumbnailAsync(true);
+						section.ChildItems.Insert(position, drive);
+						await drive.LoadThumbnailAsync(true);
+					}
 				}
 			}
 			else