Split HandledCallback

Author: d2dyno1

SecureFolderFS.Backend/Utils/ICanceledFlag.cs

@@ -0,0 +1,7 @@
+namespace SecureFolderFS.Backend.Utils
+{
+    public interface ICanceledFlag
+    {
+        void Cancel();
+    }
+}

SecureFolderFS.Backend/Utils/IHandledFlag.cs

@@ -0,0 +1,9 @@
+namespace SecureFolderFS.Backend.Utils
+{
+    public interface IHandledFlag
+    {
+        void Handle();
+
+        void Handle(bool value);
+    }
+}

SecureFolderFS.Backend/ViewModels/Pages/VaultWizard/AddExistingVaultPageViewModel.cs

@@ -34,11 +34,11 @@ public string? PathSourceText
         public AddExistingVaultPageViewModel(IMessenger messenger, VaultWizardDialogViewModel dialogViewModel)
             : base(messenger, dialogViewModel)
         {
-            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<HandledCallback?>(PrimaryButtonClick);
+            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<IHandledFlag?>(PrimaryButtonClick);
             BrowseForFolderCommand = new AsyncRelayCommand(BrowseForFolder);
         }
 
-        private void PrimaryButtonClick(HandledCallback? e)
+        private void PrimaryButtonClick(IHandledFlag? e)
         {
             e?.Handle();
             DialogViewModel.VaultViewModel = new(new(), Path.GetDirectoryName(PathSourceText!)!);

SecureFolderFS.Backend/ViewModels/Pages/VaultWizard/ChooseEncryptionPageViewModel.cs

@@ -33,10 +33,10 @@ public ChooseEncryptionPageViewModel(IVaultCreationRoutineStep9 step9, IMessenge
             base.CanGoBack = false;
 
             DialogViewModel.PrimaryButtonEnabled = true;
-            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<HandledCallback?>(PrimaryButtonClick);
+            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<IHandledFlag?>(PrimaryButtonClick);
         }
 
-        private void PrimaryButtonClick(HandledCallback? e)
+        private void PrimaryButtonClick(IHandledFlag? e)
         {
             e?.Handle();
 

SecureFolderFS.Backend/ViewModels/Pages/VaultWizard/ChooseVaultCreationPathPageViewModel.cs

@@ -35,13 +35,13 @@ public ChooseVaultCreationPathPageViewModel(IMessenger messenger, VaultWizardDia
         {
             DialogViewModel.PrimaryButtonEnabled = false;
 
-            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<HandledCallback?>(PrimaryButtonClick);
+            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<IHandledFlag?>(PrimaryButtonClick);
             BrowseForFolderCommand = new AsyncRelayCommand(BrowseForFolder);
         }
 
         public override void ReattachCommands()
         {
-            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<HandledCallback?>(e =>
+            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<IHandledFlag?>(e =>
             {
                 e?.Handle();
 
@@ -50,7 +50,7 @@ public override void ReattachCommands()
             DialogViewModel.PrimaryButtonEnabled = CheckAvailability(_PathSourceText);
         }
 
-        private void PrimaryButtonClick(HandledCallback? e)
+        private void PrimaryButtonClick(IHandledFlag? e)
         {
             // Cancel the confirm button
             e?.Handle();

SecureFolderFS.Backend/ViewModels/Pages/VaultWizard/SetPasswordPageViewModel.cs

@@ -23,16 +23,16 @@ public SetPasswordPageViewModel(IVaultCreationRoutineStep7 step7, IMessenger mes
         {
             this._step7 = step7;
 
-            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<HandledCallback?>(PrimaryButtonClick);
-            DialogViewModel.SecondaryButtonClickCommand = new RelayCommand<HandledCallback?>(SecondaryButtonClick);
+            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<IHandledFlag?>(PrimaryButtonClick);
+            DialogViewModel.SecondaryButtonClickCommand = new RelayCommand<IHandledFlag?>(SecondaryButtonClick);
         }
 
         public override void ReattachCommands()
         {
-            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<HandledCallback?>(PrimaryButtonClick);
+            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<IHandledFlag?>(PrimaryButtonClick);
         }
 
-        private void PrimaryButtonClick(HandledCallback? e)
+        private void PrimaryButtonClick(IHandledFlag? e)
         {
             e?.Handle();
 
@@ -44,7 +44,7 @@ private void PrimaryButtonClick(HandledCallback? e)
             Messenger.Send(new VaultWizardNavigationRequestedMessage(_nextViewModel));
         }
 
-        private void SecondaryButtonClick(HandledCallback? e)
+        private void SecondaryButtonClick(IHandledFlag? e)
         {
             Messenger.Send(new PasswordClearRequestedMessage());
         }

SecureFolderFS.Backend/ViewModels/Pages/VaultWizard/VaultWizardFinishPageViewModel.cs

@@ -17,7 +17,7 @@ public VaultWizardFinishPageViewModel(IMessenger messenger, VaultWizardDialogVie
             base.CanGoBack = false;
 
             DialogViewModel.PrimaryButtonEnabled = true;
-            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<HandledCallback?>(_ => { }); // Override the previous action
+            DialogViewModel.PrimaryButtonClickCommand = new RelayCommand<IHandledFlag?>(_ => { }); // Override the previous action
 
             WeakReferenceMessenger.Default.Send(new AddVaultRequestedMessage(DialogViewModel.VaultViewModel));
         }

SecureFolderFS.Core/Chunks/Implementation/BaseCleartextChunk.cs

@@ -76,6 +76,13 @@ public virtual byte[] ToArray()
             return returnBuffer;
         }
 
+        public virtual Span<byte> AsSpan()
+        {
+            AssertNotDisposed();
+
+            return buffer.AsSpan(0, ActualLength);
+        }
+
         protected void AssertNotDisposed()
         {
             if (_disposed)

SecureFolderFS.WinUI/Dialogs/VaultWizardDialog.xaml.cs

@@ -11,6 +11,7 @@
 using SecureFolderFS.Backend.Utils;
 using SecureFolderFS.Backend.ViewModels.Dialogs;
 using SecureFolderFS.Backend.ViewModels.Pages.VaultWizard;
+using SecureFolderFS.WinUI.Helpers;
 using SecureFolderFS.WinUI.Views.VaultWizard;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -152,13 +153,13 @@ private void VaultWizardDialog_Loaded(object sender, RoutedEventArgs e)
 
         private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
         {
-            var handledCallback = new HandledCallback(value => args.Cancel = value);
+            var handledCallback = new HandledOrCanceledFlag(value => args.Cancel = value);
             ViewModel.PrimaryButtonClickCommand?.Execute(handledCallback);
         }
 
         private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
         {
-            var handledCallback = new HandledCallback(value => args.Cancel = value);
+            var handledCallback = new HandledOrCanceledFlag(value => args.Cancel = value);
             ViewModel.SecondaryButtonClickCommand?.Execute(handledCallback);
         }
 

…olderFS.Backend/Utils/HandledCallback.cs …S.WinUI/Helpers/HandledOrCanceledFlag.csSecureFolderFS.Backend/Utils/HandledCallback.cs renamed to SecureFolderFS.WinUI/Helpers/HandledOrCanceledFlag.cs SecureFolderFS.Backend/Utils/HandledCallback.cs renamed to SecureFolderFS.WinUI/Helpers/HandledOrCanceledFlag.cs

@@ -1,23 +1,27 @@
-using System;
+using SecureFolderFS.Backend.Utils;
+using System;
 
-#nullable enable
-
-namespace SecureFolderFS.Backend.Utils
+namespace SecureFolderFS.WinUI.Helpers
 {
-    public sealed class HandledCallback
+    internal sealed class HandledOrCanceledFlag : IHandledFlag, ICanceledFlag
     {
         private readonly Action<bool> _flagCallback;
 
-        public HandledCallback(Action<bool> flagCallback)
+        public HandledOrCanceledFlag(Action<bool> flagCallback)
         {
             this._flagCallback = flagCallback;
         }
 
+        public void Cancel()
+        {
+            Handle();
+        }
+
         public void Handle()
         {
             Handle(true);
         }
-        
+
         public void Handle(bool value)
         {
             _flagCallback(value);