From 2daf4cf46ab2a493b7c4f92952985e5825fba6c3 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Sat, 11 Feb 2017 08:20:10 -0700 Subject: [PATCH] xml cred repo editor page now validates contents before allowing to confirm submission --- .../XmlCredentialRepositoryEditorPage.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositoryEditorPages/XmlCredentialRepositoryEditorPage.cs b/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositoryEditorPages/XmlCredentialRepositoryEditorPage.cs index bb017947..ca6b9130 100644 --- a/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositoryEditorPages/XmlCredentialRepositoryEditorPage.cs +++ b/mRemoteV1/UI/Forms/CredentialManagerPages/CredentialRepositoryEditorPages/XmlCredentialRepositoryEditorPage.cs @@ -45,6 +45,8 @@ namespace mRemoteNG.UI.Forms.CredentialManagerPages.CredentialRepositoryEditorPa private void buttonBrowseFiles_Click(object sender, EventArgs e) { + if (!string.IsNullOrEmpty(_repositoryConfig.Source)) + selectFilePathDialog.FileName = _repositoryConfig.Source; var dialogResult = selectFilePathDialog.ShowDialog(this); if (dialogResult == DialogResult.OK) { @@ -54,6 +56,7 @@ namespace mRemoteNG.UI.Forms.CredentialManagerPages.CredentialRepositoryEditorPa private void buttonConfirm_Click(object sender, EventArgs e) { + if (!AllRequiredFieldsFilledOut()) return; var dataProvider = new FileDataProvider(_repositoryConfig.Source); var deserializer = new XmlCredentialDeserializer(); var repository = new XmlCredentialRepository(_repositoryConfig, dataProvider, deserializer); @@ -62,6 +65,11 @@ namespace mRemoteNG.UI.Forms.CredentialManagerPages.CredentialRepositoryEditorPa _pageSequence.Next(); } + private bool AllRequiredFieldsFilledOut() + { + return newPasswordBoxes.PasswordsMatch && !string.IsNullOrEmpty(selectFilePathDialog.FileName); + } + private void buttonBack_Click(object sender, EventArgs e) { _pageSequence.Previous();