prehistoric-systems/Crypto-Notepad
1
0
Fork 0
mirror of https://github.com/Crypto-Notepad/Crypto-Notepad.git synced 2026-03-11 08:55:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed check for empty variables

Browse source
This commit is contained in:
Alexander 2019-10-15 19:48:17 +03:00
parent adaf4b7f3b
commit 9c44976c44
2 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Crypto Notepad/ChangeKeyForm.cs
View file

@ -11,22 +11,21 @@ public partial class ChangeKeyForm : Form
public ChangeKeyForm()
{
InitializeComponent();
statusLabel.Text = "";
}
/*Buttons*/
private async void AcceptButton_Click(object sender, EventArgs e)
{
oldKeyTextBox.Focus();
if (oldKeyTextBox.Text == PublicVar.encryptionKey.Get() && oldKeyTextBox.Text != newKeyTextBox.Text)
if (oldKeyTextBox.Text == PublicVar.encryptionKey.Get() & oldKeyTextBox.Text != newKeyTextBox.Text)
{
PublicVar.encryptionKey.Set(newKeyTextBox.Text);
PublicVar.keyChanged = true;
oldKeyTextBox.Text = "";
newKeyTextBox.Text = "";
statusLabel.ForeColor = Color.Green;
statusLabel.Text = "Key was successfully changed";
statusLabel.Visible = true;
acceptButton.Enabled = false;
oldKeyTextBox.Text = "";
newKeyTextBox.Text = "";
await Task.Delay(2000);
statusLabel.Text = "";
}

40
Crypto Notepad/MainForm.cs
View file

@ -251,7 +251,7 @@ private void SaveConfirm()
{
if (richTextBox.Modified)
{
if (PublicVar.openFileName == string.Empty | PublicVar.openFileName == null)
if (string.IsNullOrEmpty(PublicVar.openFileName))
{
PublicVar.openFileName = "Unnamed.cnp";
}
@ -453,7 +453,7 @@ private void LockFile()
fileLockedPanel.Visible = false;
Text = PublicVar.appName;
filePath = "";
PublicVar.openFileName = null;
PublicVar.openFileName = "";
}
}
}
@ -632,7 +632,7 @@ private void MainForm_Resize(object sender, EventArgs e)
}
}
if (WindowState == FormWindowState.Minimized & settings.autoLock & PublicVar.encryptionKey.Get() != null)
if (WindowState == FormWindowState.Minimized & settings.autoLock & !string.IsNullOrEmpty(PublicVar.encryptionKey.Get()))
{
fileLockedPanel.Visible = true;
}
@ -674,7 +674,7 @@ private void MainWindow_FormClosing(object sender, FormClosingEventArgs e)
{
if (e.CloseReason == CloseReason.UserClosing)
{
if (settings.autoLock & PublicVar.encryptionKey.Get() != null)
if (settings.autoLock & !string.IsNullOrEmpty(PublicVar.encryptionKey.Get()))
{
fileLockedPanel.Visible = true;
}
@ -685,12 +685,11 @@ private void MainWindow_FormClosing(object sender, FormClosingEventArgs e)
}
if (richTextBox.Modified)
{
if (PublicVar.openFileName == string.Empty | PublicVar.openFileName == null)
if (string.IsNullOrEmpty(PublicVar.openFileName))
{
PublicVar.openFileName = "Unnamed.cnp";
}
if (richTextBox.Text != "")
if (!string.IsNullOrEmpty(richTextBox.Text))
{
string messageBoxText;
if (!PublicVar.keyChanged)
@ -794,7 +793,6 @@ private void RichTextBox_KeyDown(object sender, KeyEventArgs e)
findPos = 0;
}
if (e.KeyCode == Keys.Enter & searchPanel.Visible & !string.IsNullOrEmpty(searchTextBox.Text))
if (e.KeyCode == Keys.Enter & searchPanel.Visible & searchTextBox.Text != "")
{
SearchFindNextButton_Click(this, new EventArgs());
e.Handled = e.SuppressKeyPress = true;
@ -919,7 +917,7 @@ private void NewMainMenu_Click(object sender, EventArgs e)
if (!PublicVar.okPressed)
{
if (filePath != "")
if (!string.IsNullOrEmpty(filePath))
{
PublicVar.openFileName = Path.GetFileName(filePath);
}
@ -973,10 +971,11 @@ private void OpenMainMenu_Click(object sender, EventArgs e)
}
private void SaveMainMenu_Click(object sender, EventArgs e)
{
if (PublicVar.encryptionKey.Get() == null)
{
if (string.IsNullOrEmpty(PublicVar.encryptionKey.Get()))
{
SaveAsMainMenu_Click(this, new EventArgs());
return;
}
string enc = AES.Encrypt(richTextBox.Text, PublicVar.encryptionKey.Get(), null, settings.HashAlgorithm, Convert.ToInt32(settings.PasswordIterations), Convert.ToInt32(settings.KeySize));
using (StreamWriter writer = new StreamWriter(filePath))
@ -991,7 +990,7 @@ private void SaveMainMenu_Click(object sender, EventArgs e)
private void SaveAsMainMenu_Click(object sender, EventArgs e)
{
if (filePath != "")
if (!string.IsNullOrEmpty(filePath))
{
PublicVar.openFileName = Path.GetFileName(filePath);
saveFileDialog.FileName = Path.GetFileName(filePath);
@ -1039,7 +1038,7 @@ private void OpenFileLocationMainMenu_Click(object sender, EventArgs e)
private void DeleteFileToolStripMenuItem_Click(object sender, EventArgs e)
{
if (filePath != "")
if (!string.IsNullOrEmpty(filePath))
{
using (new CenterWinDialog(this))
{
@ -1053,7 +1052,7 @@ private void DeleteFileToolStripMenuItem_Click(object sender, EventArgs e)
changeKeyToolbarButton.Enabled = false;
lockToolbarButton.Enabled = false;
filePath = "";
PublicVar.openFileName = null;
PublicVar.openFileName = "";
Text = PublicVar.appName;
return;
}
@ -1068,7 +1067,7 @@ private void ExitMainMenu_Click(object sender, EventArgs e)
private void FileMainMenu_DropDownOpened(object sender, EventArgs e)
{
if (filePath == null)
if (string.IsNullOrEmpty(filePath))
{
openFileLocationMainMenu.Enabled = false;
deleteFileMainMenu.Enabled = false;
@ -1208,7 +1207,7 @@ private void AlwaysOnTopMainMenu_Click(object sender, EventArgs e)
private void ToolsMainMenu_DropDownOpened(object sender, EventArgs e)
{
if (PublicVar.encryptionKey.Get() == null)
if (string.IsNullOrEmpty(PublicVar.encryptionKey.Get()))
{
changeKeyMainMenu.Enabled = false;
lockMainMenu.Enabled = false;
@ -1458,7 +1457,7 @@ private void ToolbarPanel_MouseEnter(object sender, EventArgs e)
copyToolbarButton.Enabled = false;
}
if (PublicVar.encryptionKey.Get() == null)
if (string.IsNullOrEmpty(PublicVar.encryptionKey.Get()))
{
fileLocationToolbarButton.Enabled = false;
deleteFileToolbarButton.Enabled = false;
@ -1494,7 +1493,6 @@ private void SearchTextBox_KeyDown(object sender, KeyEventArgs e)
findPos = 0;
}
if (e.KeyCode == Keys.Enter & searchPanel.Visible & !string.IsNullOrEmpty(searchTextBox.Text))
if (e.KeyCode == Keys.Enter & searchPanel.Visible & searchTextBox.Text != "")
{
SearchFindNextButton_Click(this, new EventArgs());
e.Handled = e.SuppressKeyPress = true;
@ -1628,7 +1626,7 @@ private void FileLockedPanel_VisibleChanged(object sender, EventArgs e)
toolbarPanel.Enabled = true;
searchPanel.Enabled = true;
mainMenu.Enabled = true;
fileLockedKeyTextBox.Text = null;
fileLockedKeyTextBox.Text = "";
}
}
@ -1641,8 +1639,8 @@ private void FileLockedCloseButton_MouseClick(object sender, MouseEventArgs e)
{
fileLockedPanel.Visible = false;
Text = PublicVar.appName;
filePath = null;
PublicVar.openFileName = null;
filePath = "";
PublicVar.openFileName = "";
}
private void FileLockedShowKey_Click(object sender, EventArgs e)