Skip to content

Fix: Settings encryption message #3025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 1 commit into from
Apr 12, 2025
Merged

Fix: Settings encryption message #3025

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 28 additions & 30 deletions Source/NETworkManager/ViewModels/SettingsProfilesViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,41 +187,39 @@ private async void EnableEncryptionAction()
settings.NegativeButtonText = Strings.Cancel;
settings.DefaultButtonFocus = MessageDialogResult.Affirmative;

if (await _dialogCoordinator.ShowMessageAsync(this, Strings.Disclaimer,
Strings.ProfileEncryptionDisclaimer,
MessageDialogStyle.AffirmativeAndNegative) == MessageDialogResult.Affirmative)
if (await _dialogCoordinator.ShowMessageAsync(this, Strings.Disclaimer, Strings.ProfileEncryptionDisclaimer, MessageDialogStyle.AffirmativeAndNegative, settings) != MessageDialogResult.Affirmative)
return;

var customDialog = new CustomDialog
{
var customDialog = new CustomDialog
{
Title = Strings.SetMasterPassword
};
Title = Strings.SetMasterPassword
};

var credentialsSetPasswordViewModel = new CredentialsSetPasswordViewModel(async instance =>
{
await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
var credentialsSetPasswordViewModel = new CredentialsSetPasswordViewModel(async instance =>
{
await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);

try
{
ProfileManager.EnableEncryption(SelectedProfileFile, instance.Password);
}
catch (Exception ex)
{
var metroDialogSettings = AppearanceManager.MetroDialog;
metroDialogSettings.AffirmativeButtonText = Strings.OK;

await _dialogCoordinator.ShowMessageAsync(this, Strings.EncryptionError,
$"{Strings.EncryptionErrorMessage}\n\n{ex.Message}",
MessageDialogStyle.Affirmative, metroDialogSettings);
}
}, async _ => { await _dialogCoordinator.HideMetroDialogAsync(this, customDialog); });

customDialog.Content = new CredentialsSetPasswordDialog
try
{
DataContext = credentialsSetPasswordViewModel
};
ProfileManager.EnableEncryption(SelectedProfileFile, instance.Password);
}
catch (Exception ex)
{
var metroDialogSettings = AppearanceManager.MetroDialog;
metroDialogSettings.AffirmativeButtonText = Strings.OK;

await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
}
await _dialogCoordinator.ShowMessageAsync(this, Strings.EncryptionError,
$"{Strings.EncryptionErrorMessage}\n\n{ex.Message}",
MessageDialogStyle.Affirmative, metroDialogSettings);
}
}, async _ => { await _dialogCoordinator.HideMetroDialogAsync(this, customDialog); });

customDialog.Content = new CredentialsSetPasswordDialog
{
DataContext = credentialsSetPasswordViewModel
};

await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
}

public ICommand ChangeMasterPasswordCommand => new RelayCommand(_ => ChangeMasterPasswordAction());
Expand Down