Upstream

hellzerg · Feb 2, 2022 · beecf24 · beecf24
1 parent b2229b6
commit beecf24
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 18 deletions.
diff --git a/Lain/CryLain.cs b/Lain/CryLain.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Security;
 using System.Security.Cryptography;
 using System.Text;

diff --git a/Lain/Forms/DuplicatesForm.cs b/Lain/Forms/DuplicatesForm.cs
@@ -1,11 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Lain
@@ -25,7 +20,7 @@ public DuplicatesForm(List<LainAccount> duplicates)
             {
                 if (i >= 2)
                 {
-                    if (duplicates[i-1].Password() != duplicates[i].Password())
+                    if (duplicates[i - 1].Password() != duplicates[i].Password())
                     {
                         txtReport.AppendText(Environment.NewLine);
                     }

diff --git a/Lain/Forms/MainForm.cs b/Lain/Forms/MainForm.cs
@@ -216,7 +216,7 @@ private void Search()
             _temp = string.Empty;
             _temp2 = string.Empty;
         }
-        
+
         internal void FixColors()
         {
             AccountView.DefaultCellStyle.SelectionBackColor = Color.FromArgb(65, 65, 65);
@@ -515,7 +515,7 @@ internal void SetFontSize()
 
         private void MainForm_Load(object sender, EventArgs e)
         {
-            
+
         }
 
         private void btnAdd_Click(object sender, EventArgs e)

diff --git a/Lain/Forms/OptionsForm.cs b/Lain/Forms/OptionsForm.cs
@@ -18,7 +18,7 @@ public OptionsForm(MainForm main)
 
             LoadSettings();
             Options.ApplyTheme(this);
-            
+
             txtTimer.ShortcutsEnabled = false;
         }
 
@@ -93,7 +93,7 @@ private void LoadSettings()
 
         private void OptionsForm_Load(object sender, EventArgs e)
         {
-            
+
         }
 
         private void btnOk_Click(object sender, EventArgs e)

diff --git a/Lain/Forms/WizardForm.cs b/Lain/Forms/WizardForm.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Drawing;
 using System.IO;
-using System.IO.Compression;
 using System.Windows.Forms;
 
 namespace Lain

diff --git a/Lain/Options.cs b/Lain/Options.cs
@@ -25,7 +25,7 @@ internal static class Options
     {
         internal static Color ForegroundColor = Color.FromArgb(153, 102, 204);
         internal static Color ForegroundAccentColor = Color.FromArgb(134, 89, 179);
-        internal static Color BackgroundColor = Color.FromArgb(20,20,20);
+        internal static Color BackgroundColor = Color.FromArgb(20, 20, 20);
 
         internal readonly static string ThemeFlag = "themeable";
         readonly static string _settingsFile = Path.Combine(Required.DataFolder, "Lain.json");

diff --git a/Lain/Program.cs b/Lain/Program.cs
@@ -208,8 +208,7 @@ internal static void RestartLain()
 
         private static bool SanitizeSalt(string salt)
         {
-            return true;
-            //return !string.IsNullOrEmpty(salt) && salt.Length >= 32;
+            return !string.IsNullOrEmpty(salt) && salt.Length >= 32;
         }
 
         internal static void SetMainForm(Form form)

diff --git a/SALTS.md b/SALTS.md
@@ -5,7 +5,7 @@
 #### Salt should be at least 32 characters long. ####
 
 #### Using command-line: ####
-- Run Lain like this: Lain.exe /salt=CUSTOMSALT
+- Lain.exe /salt=CUSTOMSALT
 
 #### Using a file: ####
-- Place a Lain.salt file in Data folder with your desired salt in it and run the app normally.
+- Place a Lain.salt file in Data folder with your desired salt in it and run the app normally.