diff --git a/Password Manager/MainForm.cs b/Password Manager/MainForm.cs index e8ea4fe..e2af7b7 100644 --- a/Password Manager/MainForm.cs +++ b/Password Manager/MainForm.cs @@ -43,18 +43,26 @@ namespace Password_Manager Close(); } - private void CopyAndNotify(string line) + private void CopyAndNotify(string? line, string fileName) { - Clipboard.SetText(line); - - ProcessBuilder.ProcessFailed += (e) => MessageBox.Show(e.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - ProcessBuilder.Run("./ToastNotification.exe", $"\"{fileName} decrypted\" \"Password copied to clipboard\""); + ProcessBuilder pb = new ProcessBuilder(); + pb.ProcessFailed += (e) => MessageBox.Show(e.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + if (line != null) + { + Clipboard.SetText(line); + pb.Run("./ToastNotification.exe", $"\"{fileName} decrypted\" \"Password copied to clipboard\""); + } + else + { + pb.Run("./ToastNotification.exe", "\"Error\" \"No password copied\""); + } } private void Decrypt(object sender, EventArgs e) { - ProcessBuilder.ProcessFailed += (e) => MessageBox.Show(e.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - CopyAndNotify(ProcessBuilder.GetOutput("gpg.exe", $"--quiet --decrypt {PathRequest()}\\{ResultList.Text}")); + ProcessBuilder pb = new ProcessBuilder(); + pb.ProcessFailed += (e) => MessageBox.Show(e.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + CopyAndNotify(pb.GetOutput("gpg.exe", $"--quiet --decrypt {PathRequest()}\\{ResultList.Text}"), ResultList.Text); Close(); } } diff --git a/Password Manager/PasswordGenerator.cs b/Password Manager/PasswordGenerator.cs index 8c61819..b378748 100644 --- a/Password Manager/PasswordGenerator.cs +++ b/Password Manager/PasswordGenerator.cs @@ -31,7 +31,7 @@ public static string? New(string recipient, int length, bool no_symbols = false) { - return ProcessBuilder.GetOutput("cmd.exe" $"echo {RandomStr(length, no_symbols)} | gpg --quiet --encrypt --recipient {recipient}"); + return new ProcessBuilder().GetOutput("cmd.exe", $"echo {RandomStr(length, no_symbols)} | gpg --quiet --encrypt --recipient {recipient}"); } } }