From 5a7dfc7f9add4b67037c417a4e21aea118b45f2e Mon Sep 17 00:00:00 2001 From: Slavasil Date: Sun, 3 May 2026 16:02:20 +0300 Subject: [PATCH] make error title customizable --- src/KeyKeeper/ViewModels/LockedRepositoryViewModel.cs | 10 +++++----- src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs | 2 +- src/KeyKeeper/Views/ErrorDialog.axaml | 2 +- src/KeyKeeper/Views/ErrorDialog.axaml.cs | 3 ++- src/KeyKeeper/Views/RepositoryWindow.axaml.cs | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/KeyKeeper/ViewModels/LockedRepositoryViewModel.cs b/src/KeyKeeper/ViewModels/LockedRepositoryViewModel.cs index 11745f2..f3367fa 100644 --- a/src/KeyKeeper/ViewModels/LockedRepositoryViewModel.cs +++ b/src/KeyKeeper/ViewModels/LockedRepositoryViewModel.cs @@ -37,24 +37,24 @@ public partial class LockedRepositoryViewModel : ViewModelBase if (e.Message == PassStoreFileException.ContentHMACMismatch.Message || e.Message == PassStoreFileException.InvalidBeginMarker.Message) { - await parent.ShowErrorPopup("Incorrect password or corrupted file"); + await parent.ShowErrorPopup("Incorrect password or corrupted file", "Check password"); } else if (e.Message == PassStoreFileException.UnexpectedEndOfFile.Message || e.Message == PassStoreFileException.IncorrectMagicNumber.Message || e.Message == PassStoreFileException.InvalidCryptoHeader.Message || e.Message == PassStoreFileException.InvalidPassStoreEntry.Message) { - await parent.ShowErrorPopup("Corrupted file"); + await parent.ShowErrorPopup("Corrupted file", "Password store error"); } else if (e.Message == PassStoreFileException.UnsupportedVersion.Message) { - await parent.ShowErrorPopup("Unsupported store file version"); + await parent.ShowErrorPopup("Unsupported store file version", "Password store error"); } else { - await parent.ShowErrorPopup("Unknown password store unlock error"); + await parent.ShowErrorPopup("Unknown unlock error", "Password store error"); } } catch (Exception e) { Console.WriteLine(e); - await parent.ShowErrorPopup("Cannot open the password store file"); + await parent.ShowErrorPopup("Cannot open the password store file", "Password store error"); } } } \ No newline at end of file diff --git a/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs b/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs index 48fab08..c17d4db 100644 --- a/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs +++ b/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs @@ -16,7 +16,7 @@ public partial class RepositoryWindowViewModel : ViewModelBase private DateTime _timerStart; private string _lockTimerDisplay = string.Empty; - public Func ShowErrorPopup; + public Func ShowErrorPopup; public object CurrentPage { diff --git a/src/KeyKeeper/Views/ErrorDialog.axaml b/src/KeyKeeper/Views/ErrorDialog.axaml index 13f41ad..f21f499 100644 --- a/src/KeyKeeper/Views/ErrorDialog.axaml +++ b/src/KeyKeeper/Views/ErrorDialog.axaml @@ -19,7 +19,7 @@ Stretch="Uniform" /> - + model.ShowErrorPopup = async (string message, string title) => { - await new ErrorDialog(message).ShowDialog(this); + await new ErrorDialog(message, title).ShowDialog(this); }; }