Finished encryption service

Author: Crowley2012

MyCryptoMonitor/Forms/MainForm.Designer.cs

@@ -56,7 +56,8 @@ private void MainForm_Load(object sender, EventArgs e)
             UserConfigService.Load();
 
             //Unlock if encryption is enabled
-            EncryptionService.Unlock();
+            if (UserConfigService.Encrypted)
+                EncryptionService.Unlock();
 
             //Attempt to load portfolio on startup
             _coinConfigs = PortfolioService.LoadStartup();

MyCryptoMonitor/Forms/MainForm.cs

@@ -23,7 +23,7 @@ private void btnEncrypt_Click(object sender, EventArgs e)
             if (string.IsNullOrEmpty(txtPassword.Text))
                 return;
 
-            if (UserConfigService.Encrypted && EncryptionService.CheckPassword(txtPassword.Text))
+            if (UserConfigService.Encrypted && EncryptionService.ValidatePassword(txtPassword.Text))
             {
                 EncryptionService.DecryptFiles();
 

MyCryptoMonitor/Forms/ManageEncryption.cs

@@ -2,11 +2,11 @@
 
 namespace MyCryptoMonitor.Forms
 {
-    public partial class InputPassword : Form
+    public partial class Unlock : Form
     {
         public string PasswordInput { get { return txtPassword.Text; } }
 
-        public InputPassword()
+        public Unlock()
         {
             InitializeComponent();
         }

MyCryptoMonitor/Forms/InputPassword.Designer.cs renamed to MyCryptoMonitor/Forms/Unlock.Designer.cs

@@ -109,11 +109,11 @@
     <Compile Include="Forms\NewUI.Designer.cs">
       <DependentUpon>NewUI.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\InputPassword.cs">
+    <Compile Include="Forms\Unlock.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\InputPassword.Designer.cs">
-      <DependentUpon>InputPassword.cs</DependentUpon>
+    <Compile Include="Forms\Unlock.Designer.cs">
+      <DependentUpon>Unlock.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\ManagePortfolios.cs">
       <SubType>Form</SubType>
@@ -150,8 +150,8 @@
     <EmbeddedResource Include="Forms\NewUI.resx">
       <DependentUpon>NewUI.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\InputPassword.resx">
-      <DependentUpon>InputPassword.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Unlock.resx">
+      <DependentUpon>Unlock.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\ManagePortfolios.resx">
       <DependentUpon>ManagePortfolios.cs</DependentUpon>

MyCryptoMonitor/Forms/InputPassword.cs renamed to MyCryptoMonitor/Forms/Unlock.cs

@@ -17,24 +17,24 @@ public static class EncryptionService
         #endregion
 
         #region Methods
-        public static bool CheckPassword(string password)
+        public static bool ValidatePassword(string password)
         {
             return AesDecryptString(File.ReadAllText(CHECKFILE), password).Equals(CHECKVALUE);
         }
 
         public static void Unlock()
         {
-            if (!UserConfigService.Encrypted)
-                return;
-
-            using (InputPassword form = new InputPassword())
+            using (Unlock form = new Unlock())
             {
                 var result = form.ShowDialog();
 
                 if (result == DialogResult.OK)
                 {
-                    if (!CheckPassword(form.PasswordInput))
+                    if (!ValidatePassword(form.PasswordInput))
+                    {
                         Unlock();
+                        return;
+                    }
 
                     _password = form.PasswordInput;
                 }
@@ -55,45 +55,43 @@ public static void Unlock()
         public static void EncryptFiles(string password)
         {
             _password = password;
-            UserConfigService.Encrypted = true;
-
-            File.WriteAllText(CHECKFILE, AesEncryptString(CHECKVALUE));
 
+            CreateCheckFile();
+            UserConfigService.Encrypted = true;
             UserConfigService.Save();
             PortfolioService.EncryptPortfolios();
             AlertService.EncryptAlerts();
         }
 
         public static void DecryptFiles()
         {
-            UserConfigService.Encrypted = false;
-
             DeleteCheckFile();
-
+            UserConfigService.Encrypted = false;
             UserConfigService.Save();
             PortfolioService.DecryptPortfolios();
             AlertService.DecryptAlerts();
         }
 
-        public static void DeleteCheckFile()
-        {
-
-            if (File.Exists(CHECKFILE))
-                File.Delete(CHECKFILE);
-        }
-
         public static void Reset()
         {
             DeleteCheckFile();
-
             PortfolioService.DeleteAll();
             AlertService.Delete();
             UserConfigService.Delete();
         }
-        #endregion
-
 
+        private static void CreateCheckFile()
+        {
+            if (!File.Exists(CHECKFILE))
+                File.WriteAllText(CHECKFILE, AesEncryptString(CHECKVALUE));
+        }
 
+        private static void DeleteCheckFile()
+        {
+            if (File.Exists(CHECKFILE))
+                File.Delete(CHECKFILE);
+        }
+        #endregion
 
         #region Encrypt
         public static string AesEncryptString(string clearText)

MyCryptoMonitor/Forms/InputPassword.resx renamed to MyCryptoMonitor/Forms/Unlock.resx

@@ -66,7 +66,7 @@ public static void Delete(string portfolio)
         public static void DeleteAll()
         {
             foreach(var portfolio in GetPortfolios())
-                File.Delete(portfolio + FILEEXTENSION);
+                File.Delete(portfolio.FileName);
         }
         #endregion