Mirrors/KeyKeeper
1
0
Fork 0
mirror of https://github.com/KeyKeeperApp/KeyKeeper.git synced 2026-05-09 09:56:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

make error title customizable

Browse Source
This commit is contained in:
Slavasil
2026-05-03 16:02:20 +03:00
parent 0a36ad69c1
commit 5a7dfc7f9a
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/KeyKeeper/ViewModels/LockedRepositoryViewModel.cs
View File

@@ -37,24 +37,24 @@ public partial class LockedRepositoryViewModel : ViewModelBase
if (e.Message == PassStoreFileException.ContentHMACMismatch.Message || if (e.Message == PassStoreFileException.ContentHMACMismatch.Message ||
e.Message == PassStoreFileException.InvalidBeginMarker.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 || } else if (e.Message == PassStoreFileException.UnexpectedEndOfFile.Message ||
e.Message == PassStoreFileException.IncorrectMagicNumber.Message || e.Message == PassStoreFileException.IncorrectMagicNumber.Message ||
e.Message == PassStoreFileException.InvalidCryptoHeader.Message || e.Message == PassStoreFileException.InvalidCryptoHeader.Message ||
e.Message == PassStoreFileException.InvalidPassStoreEntry.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) } 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 } else
{ {
await parent.ShowErrorPopup("Unknown password store unlock error"); await parent.ShowErrorPopup("Unknown unlock error", "Password store error");
} }
} catch (Exception e) } catch (Exception e)
{ {
Console.WriteLine(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");
} }
} }
} }

2
src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
View File

@@ -16,7 +16,7 @@ public partial class RepositoryWindowViewModel : ViewModelBase
private DateTime _timerStart; private DateTime _timerStart;
private string _lockTimerDisplay = string.Empty; private string _lockTimerDisplay = string.Empty;
public Func<string, Task> ShowErrorPopup; public Func<string, string, Task> ShowErrorPopup;
public object CurrentPage public object CurrentPage
{ {

2
src/KeyKeeper/Views/ErrorDialog.axaml
View File

@@ -19,7 +19,7 @@
Stretch="Uniform" /> Stretch="Uniform" />
<StackPanel VerticalAlignment="Center" Width="280"> <StackPanel VerticalAlignment="Center" Width="280">
<TextBlock Text="Oops! Something went wrong" <TextBlock x:Name="MessageTitle"
FontWeight="Bold" FontWeight="Bold"
FontSize="16" FontSize="16"
Foreground="#333" Foreground="#333"

3
src/KeyKeeper/Views/ErrorDialog.axaml.cs
View File

@@ -5,10 +5,11 @@ namespace KeyKeeper.Views;
public partial class ErrorDialog : Window public partial class ErrorDialog : Window
{ {
public ErrorDialog(string message) public ErrorDialog(string message, string title = "Oops! Something went wrong")
{ {
InitializeComponent(); InitializeComponent();
MessageText.Text = message; MessageText.Text = message;
MessageTitle.Text = title;
} }
private void Ok_Click(object? sender, RoutedEventArgs e) private void Ok_Click(object? sender, RoutedEventArgs e)

4
src/KeyKeeper/Views/RepositoryWindow.axaml.cs
View File

@@ -23,9 +23,9 @@ public partial class RepositoryWindow : Window
MinHeight = 500; MinHeight = 500;
DataContext = model; DataContext = model;
model.ShowErrorPopup = async (string message) => model.ShowErrorPopup = async (string message, string title) =>
{ {
await new ErrorDialog(message).ShowDialog(this); await new ErrorDialog(message, title).ShowDialog(this);
}; };
} }