Fixed ghost navigation after locking

Author: d2dyno1

src/Platforms/SecureFolderFS.Maui/Views/Vault/LoginPage.xaml.cs

@@ -101,7 +101,7 @@ private async void ViewModel_NavigationRequested(object? sender, NavigationReque
             dashboardViewModel.DashboardNavigation.Views.Add(overviewViewModel);
             dashboardViewModel.DashboardNavigation.Views.Add(propertiesViewModel);
 
-            await ViewModel.VaultNavigation.TryNavigateAndForgetAsync(dashboardViewModel);
+            await ViewModel.VaultNavigation.ForgetNavigateCurrentViewAsync(dashboardViewModel);
         }
 
         public VaultLoginViewModel? ViewModel

src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultLoginPage.xaml.cs

@@ -72,7 +72,7 @@ private async void ViewModel_NavigationRequested(object? sender, NavigationReque
             var dashboardNavigation = DI.Service<INavigationService>();
             var dashboardViewModel = new VaultDashboardViewModel(args.UnlockedVaultViewModel, ViewModel.VaultNavigation, dashboardNavigation);
 
-            await ViewModel.VaultNavigation.TryNavigateAndForgetAsync(dashboardViewModel);
+            await ViewModel.VaultNavigation.ForgetNavigateCurrentViewAsync(dashboardViewModel);
         }
     }
 }

src/Sdk/SecureFolderFS.Sdk/Extensions/NavigationExtensions.cs

@@ -32,17 +32,46 @@ public static async Task<bool> TryNavigateAsync<T>(this INavigationService navig
             return await navigation.NavigateAsync(view);
         }
 
-        public static async Task<bool> TryNavigateAndForgetAsync(this INavigationService navigationService, IViewDesignation view)
+        public static async Task<bool> ForgetNavigateCurrentViewAsync(this INavigationService navigationService, IViewDesignation view)
+        {
+            return await ForgetNavigateViewAsync(navigationService, view, () =>
+            {
+                if (navigationService.CurrentView is null)
+                    return null;
+
+                navigationService.Views.Remove(navigationService.CurrentView);
+                return navigationService.CurrentView;
+            });
+        }
+
+        public static async Task<bool> ForgetNavigateSpecificViewAsync(this INavigationService navigationService, IViewDesignation view, Func<IViewDesignation, bool> viewFinder)
+        {
+            return await ForgetNavigateViewAsync(navigationService, view, () =>
+            {
+                var targetView = navigationService.Views.FirstOrDefault(viewFinder);
+                if (targetView is null)
+                    return null;
+
+                navigationService.Views.Remove(targetView);
+                return targetView;
+            }, navigationService.CurrentView is null || viewFinder(navigationService.CurrentView));
+        }
+
+        private static async Task<bool> ForgetNavigateViewAsync(this INavigationService navigationService, IViewDesignation view, Func<IViewDesignation?> viewForgetter, bool shouldTriggerNavigation = true)
         {
             var navigated = false;
             IViewDesignation? currentView = null;
 
             try
             {
-                if (navigationService.CurrentView is not null)
+                currentView = viewForgetter();
+                if (!shouldTriggerNavigation)
                 {
-                    navigationService.Views.Remove(navigationService.CurrentView);
-                    currentView = navigationService.CurrentView;
+                    // Silently replace the removed view without triggering navigation
+                    if (currentView is not null)
+                        navigationService.Views.Add(view);
+
+                    return false;
                 }
 
                 navigated = await navigationService.NavigateAsync(view);

src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/VaultControlsViewModel.cs

@@ -1,17 +1,20 @@
 using System;
 using System.ComponentModel;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Contexts;
 using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.Messages;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Views.Vault;
 using SecureFolderFS.Shared;
 using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
 
 namespace SecureFolderFS.Sdk.ViewModels.Controls
 {
@@ -75,7 +78,7 @@ private async Task LockVaultAsync()
             _ = loginPageViewModel.InitAsync();
 
             // Navigate away
-            await _vaultNavigation.TryNavigateAndForgetAsync(loginPageViewModel);
+            await _vaultNavigation.ForgetNavigateSpecificViewAsync(loginPageViewModel, x => (x as IVaultViewContext)?.VaultViewModel.VaultModel.Equals(_unlockedVaultViewModel.VaultViewModel.VaultModel) ?? false);
             WeakReferenceMessenger.Default.Send(new VaultLockedMessage(_unlockedVaultViewModel.VaultViewModel.VaultModel));
         }
 

src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/WidgetsListViewModel.cs

@@ -70,8 +70,7 @@ public async Task InitAsync(CancellationToken cancellationToken = default)
         /// <inheritdoc/>
         public void Dispose()
         {
-            foreach (var item in Widgets)
-                item.Dispose();
+            Widgets.DisposeAll();
         }
     }
 }

src/Sdk/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultHealthViewModel.Scanning.cs

@@ -1,11 +1,10 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Input;
-using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.EventArguments;
 using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Shared.Extensions;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Vault
 {

src/Shared/SecureFolderFS.Shared/Extensions/CollectionExtensions.cs

@@ -66,13 +66,11 @@ public static void AddMultiple<T>(this ICollection<T> collection, IEnumerable<T>
 
         public static T? RemoveMatch<T>(this ICollection<T> list, Func<T, bool> predicate)
         {
-            foreach (var item in list)
-            {
-                if (predicate(item))
-                    return list.Remove(item) ? item : default;
-            }
+            var item = list.FirstOrDefault(predicate);
+            if (item is null)
+                return default;
 
-            return default;
+            return list.Remove(item) ? item : default;
         }
 
         public static bool IsEmpty<T>([NotNullWhen(false)] this IEnumerable<T>? enumerable)