Fix a few sonarqube issues (#152)

KeeTrayTOTP · May 9, 2020 · 8bfe2c7 · 8bfe2c7
1 parent 415615b
commit 8bfe2c7
Show file tree

Hide file tree

Showing 10 changed files with 168 additions and 195 deletions.
diff --git a/KeeTrayTOTP/FormAbout.cs b/KeeTrayTOTP/FormAbout.cs
@@ -1,8 +1,9 @@
-using System;
+using KeePass.UI;
+using KeeTrayTOTP.Localization;
+using System;
 using System.Drawing;
 using System.Reflection;
 using System.Windows.Forms;
-using KeePass.UI;
 
 namespace KeeTrayTOTP
 {
@@ -14,7 +15,7 @@ internal partial class FormAbout : Form
         /// <summary>
         /// Tray TOTP Support Url
         /// </summary>
-        private static readonly Uri SupportUrl = new Uri("https://github.com/KeeTrayTOTP/KeeTrayTOTP/issues", UriKind.Absolute);
+        private static readonly Uri SupportUrl = new Uri(Strings.SupportUrl, UriKind.Absolute);
 
         /// <summary>
         /// Windows Form Constructor.
@@ -33,7 +34,7 @@ private void FormAbout_Load(object sender, EventArgs e)
         {
             GlobalWindowManager.AddWindow(this);
 
-            Text = Localization.Strings.About + " - " + Localization.Strings.TrayTOTPPlugin;
+            Text = Strings.About + " - " + Strings.TrayTOTPPlugin;
             ListViewAbout.Items[0].SubItems.Add(AssemblyTitle);
             ListViewAbout.Items[1].SubItems.Add(AssemblyCompany);
             ListViewAbout.Items[2].SubItems.Add(AssemblyVersion);
@@ -169,7 +170,7 @@ private void ListViewAbout_MouseClick(object sender, MouseEventArgs e)
         {
             var hit = ListViewAbout.HitTest(e.Location);
             if (hit.Item != null && hit.Item == ListViewAbout.Items[4] && hit.SubItem == ListViewAbout.Items[4].SubItems[1])
-            { 
+            {
                 System.Diagnostics.Process.Start(SupportUrl.ToString());
             }
         }
@@ -194,10 +195,13 @@ private void SetHyperlinkStyle(int RowIndex, Color color)
         private void ListViewAbout_MouseMove(object sender, MouseEventArgs e)
         {
             var hit = ListViewAbout.HitTest(e.Location);
-            if (hit.SubItem != null && hit.SubItem == hit.Item.SubItems[1] && hit.Item == ListViewAbout.Items[4]) {
+            if (hit.SubItem != null && hit.SubItem == hit.Item.SubItems[1] && hit.Item == ListViewAbout.Items[4])
+            {
                 ListViewAbout.Cursor = Cursors.Hand;
-            } else {
-                ListViewAbout.Cursor = Cursors.Default; 
+            }
+            else
+            {
+                ListViewAbout.Cursor = Cursors.Default;
             }
         }
     }

diff --git a/KeeTrayTOTP/FormSettings.Designer.cs b/KeeTrayTOTP/FormSettings.Designer.cs
diff --git a/KeeTrayTOTP/FormSettings.cs b/KeeTrayTOTP/FormSettings.cs
@@ -1,7 +1,7 @@
-using System;
+using KeePass.UI;
+using System;
 using System.ComponentModel;
 using System.Windows.Forms;
-using KeePass.UI;
 
 namespace KeeTrayTOTP
 {
@@ -376,26 +376,14 @@ private void WorkerSave_DoWork(object sender, DoWorkEventArgs e)
             _plugin.Settings.AutoTypeEnable = CheckBoxAutoType.Checked;
             if (CheckBoxAutoTypeFieldName.Checked)
             {
-                string oldAutoTypeFieldName = _plugin.Settings.AutoTypeFieldName.ExtWithBrackets();
-                string newAutoTypeFieldName = TextBoxAutoTypeFieldName.Text.ExtWithBrackets();
-                KeePass.Util.Spr.SprEngine.FilterPlaceholderHints.Remove(oldAutoTypeFieldName);
-                if (CheckBoxAutoTypeFieldRename.Checked) //Replace existing field of custom keystrokes from all entries and all groups
+                if (CheckBoxAutoTypeFieldRename.Checked) // Replace existing field of custom keystrokes from all entries and all groups
                 {
-                    _plugin.PluginHost.MainWindow.ActiveDatabase.RootGroup.DefaultAutoTypeSequence = _plugin.PluginHost.MainWindow.ActiveDatabase.RootGroup.DefaultAutoTypeSequence.Replace(oldAutoTypeFieldName, newAutoTypeFieldName);
-                    foreach (var group in _plugin.PluginHost.MainWindow.ActiveDatabase.RootGroup.GetGroups(true))
-                    {
-                        group.DefaultAutoTypeSequence = group.DefaultAutoTypeSequence.Replace(oldAutoTypeFieldName, newAutoTypeFieldName);
-                        foreach (var pe in group.GetEntries(false))
-                        {
-                            foreach (var association in pe.AutoType.Associations)
-                            {
-                                association.Sequence = association.Sequence.Replace(oldAutoTypeFieldName, newAutoTypeFieldName);
-                            }
-                        }
-                    }
+                    string oldAutoTypeFieldName = _plugin.Settings.AutoTypeFieldName.ExtWithBrackets();
+                    string newAutoTypeFieldName = TextBoxAutoTypeFieldName.Text.ExtWithBrackets();
+
+                    SetupAutoType(oldAutoTypeFieldName, newAutoTypeFieldName);
                 }
                 _plugin.Settings.AutoTypeFieldName = TextBoxAutoTypeFieldName.Text;
-                KeePass.Util.Spr.SprEngine.FilterPlaceholderHints.Add(newAutoTypeFieldName);
             }
             if (WorkerSave.CancellationPending) { e.Cancel = true; return; }
 
@@ -450,8 +438,14 @@ private void WorkerReset_DoWork(object sender, DoWorkEventArgs e)
 
             // Auto Type
             string newAutoTypeFieldName = Localization.Strings.TOTP.ExtWithBrackets();
-            KeePass.Util.Spr.SprEngine.FilterPlaceholderHints.Add(newAutoTypeFieldName);
+            SetupAutoType(oldAutoTypeFieldName, newAutoTypeFieldName);
+        }
+
+        private void SetupAutoType(string oldAutoTypeFieldName, string newAutoTypeFieldName)
+        {
             KeePass.Util.Spr.SprEngine.FilterPlaceholderHints.Remove(oldAutoTypeFieldName);
+            KeePass.Util.Spr.SprEngine.FilterPlaceholderHints.Add(newAutoTypeFieldName);
+
             _plugin.PluginHost.MainWindow.ActiveDatabase.RootGroup.DefaultAutoTypeSequence = _plugin.PluginHost.MainWindow.ActiveDatabase.RootGroup.DefaultAutoTypeSequence.Replace(oldAutoTypeFieldName, newAutoTypeFieldName);
             foreach (var group in _plugin.PluginHost.MainWindow.ActiveDatabase.RootGroup.GetGroups(true))
             {

diff --git a/KeeTrayTOTP/FormTimeCorrection.cs b/KeeTrayTOTP/FormTimeCorrection.cs
@@ -1,10 +1,8 @@
-using System;
+using KeePass.UI;
+using KeeTrayTOTP.Libraries;
+using System;
 using System.ComponentModel;
-using System.Linq;
 using System.Windows.Forms;
-using KeePass.UI;
-using KeeTrayTOTP.Helpers;
-using KeeTrayTOTP.Libraries;
 
 namespace KeeTrayTOTP
 {
@@ -139,7 +137,7 @@ private void WorkerWaitForCheck_RunWorkerCompleted(object sender, RunWorkerCompl
                 ButtonVerify.Enabled = true; //Enables the user to retry the URL validation.
                 ComboBoxUrlTimeCorrection.Enabled = true; //Enables the user to modify the last URL that was attempted to validate.
             }
-            ButtonCancel.Enabled = true; //Enables the user to discard the last URL that was attempted to validate. 
+            ButtonCancel.Enabled = true; //Enables the user to discard the last URL that was attempted to validate.
         }
 
         /// <summary>

diff --git a/KeeTrayTOTP/ISettings.cs b/KeeTrayTOTP/ISettings.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 
 namespace KeeTrayTOTP
 {

diff --git a/KeeTrayTOTP/Libraries/TOTPProvider.cs b/KeeTrayTOTP/Libraries/TOTPProvider.cs
@@ -16,45 +16,12 @@ public class TOTPProvider
         /// <summary>
         /// Duration of generation of each totp, in seconds.
         /// </summary>
-        private int _duration;
-        public int Duration
-        {
-            get
-            {
-                return this._duration;
-            }
-            set
-            {
-                if (value <= 0)
-                {
-                    throw new Exception("Invalid Duration."); //Throws an exception if the duration is invalid as the class cannot work without it.
-                }
-
-                this._duration = value;
-            }
-        }
+        private readonly int _duration;
 
         /// <summary>
         /// Length of the generated totp.
         /// </summary>
-        private int _length;
-        public int Length
-        {
-            get
-            {
-                return this._length;
-            }
-            set
-            {
-                //Throws an exception if the length is invalid as the class cannot work without it.
-                if (value < 4 || value > 8)
-                {
-                    throw new Exception("Invalid Length.");
-                }
-
-                this._length = value; //Defines variable from argument.
-            }
-        }
+        private readonly int _length;
 
         public Func<byte[], int, string> Encoder { get; set; }
 

diff --git a/KeeTrayTOTP/Libraries/TimeCorrectionProvider.cs b/KeeTrayTOTP/Libraries/TimeCorrectionProvider.cs
@@ -61,7 +61,7 @@ public TimeCorrectionProvider(string url, bool enable = true)
         {
             if (string.IsNullOrEmpty(url))
             {
-                throw new Exception("Invalid URL."); //Throws exception if the URL is invalid as the class cannot work without it.
+                throw new ArgumentException("Invalid URL.", "url");
             }
 
             Url = url; //Defines variable from argument.

diff --git a/KeeTrayTOTP/Localization/Strings.Designer.cs b/KeeTrayTOTP/Localization/Strings.Designer.cs
diff --git a/KeeTrayTOTP/Localization/Strings.resx b/KeeTrayTOTP/Localization/Strings.resx
@@ -233,6 +233,9 @@
   <data name="ShowQR" xml:space="preserve">
     <value>Show QR</value>
   </data>
+  <data name="SupportUrl" xml:space="preserve">
+    <value>https://github.com/KeeTrayTOTP/KeeTrayTOTP/issues</value>
+  </data>
   <data name="SwitchTo" xml:space="preserve">
     <value>Switch to {0}</value>
     <comment>{0} is a database name</comment>

diff --git a/KeeTrayTOTP/Settings.cs b/KeeTrayTOTP/Settings.cs
@@ -1,7 +1,6 @@
 using KeePass.App.Configuration;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 
 namespace KeeTrayTOTP
 {