Fixed some crashes on putting invalid token or URL to settings; Dropped unused username field from settings

Author: mrblur

GitlabCleaner/App.config

@@ -13,9 +13,6 @@
             <setting name="url" serializeAs="String">
                 <value />
             </setting>
-            <setting name="username" serializeAs="String">
-                <value />
-            </setting>
             <setting name="apikey" serializeAs="String">
                 <value />
             </setting>

GitlabCleaner/MainForm.cs

@@ -5,7 +5,6 @@
 using System.Windows.Forms;
 using GitLabApiClient;
 using GitLabApiClient.Models.Pipelines;
-using GitLabApiClient.Models.Pipelines.Responses;
 
 namespace GitlabCleaner
 {
@@ -32,14 +31,19 @@ private void settingsButton_Click(object sender, EventArgs e)
 
         private async void connectButton_Click(object sender, EventArgs e)
         {
-            if (Properties.Settings.Default.apikey.Length == 0)
+            if (Properties.Settings.Default.apikey.Length == 0 || Properties.Settings.Default.url.Length == 0)
             {
                 return;
             }
 
-            if (client == null)
+            try
             {
-                client = new GitLabClient(Properties.Settings.Default.url, Properties.Settings.Default.apikey);
+                listView1.UseWaitCursor = true;
+                if (client == null)
+                {
+                    client = new GitLabClient(Properties.Settings.Default.url, Properties.Settings.Default.apikey);
+                }
+                listView1.Items.Clear();
                 toolStripStatusLabel1.Text = Properties.Resources.Connecting;
                 toolStripProgressBar1.Style = ProgressBarStyle.Marquee;
                 GitLabApiClient.Models.Users.Responses.Session session = await client.Users.GetCurrentSessionAsync().ConfigureAwait(true);
@@ -52,6 +56,7 @@ private async void connectButton_Click(object sender, EventArgs e)
                 };
                 userAvatar.LoadAsync();
                 userAvatar.LoadCompleted += delegate { toolStripLabel1.Image = userAvatar.Image; };
+                userAvatar.Dispose();
 
                 toolStripStatusLabel1.Text = Properties.Resources.DownloadingProjects;
                 IList<GitLabApiClient.Models.Projects.Responses.Project> projects = await client.Projects.GetAsync().ConfigureAwait(true);
@@ -60,8 +65,9 @@ private async void connectButton_Click(object sender, EventArgs e)
                 toolStripProgressBar1.Maximum = projects.Count;
                 toolStripProgressBar1.Style = ProgressBarStyle.Continuous;
                 listView1.Items.Clear();
-                listView1.UseWaitCursor = true;
-                foreach (GitLabApiClient.Models.Projects.Responses.Project project in projects) {
+                
+                foreach (GitLabApiClient.Models.Projects.Responses.Project project in projects)
+                {
                     toolStripProgressBar1.PerformStep();
                     toolStripStatusLabel1.Text = String.Format(CultureInfo.CurrentCulture, Properties.Resources.DownloadingPipelineProgress, toolStripProgressBar1.Value, toolStripProgressBar1.Maximum, Math.Ceiling(toolStripProgressBar1.Value / toolStripProgressBar1.Maximum * 100.0));
                     ListViewGroup group = new ListViewGroup(project.NameWithNamespace);
@@ -85,6 +91,15 @@ private async void connectButton_Click(object sender, EventArgs e)
 
                 selectDropdownButton.Enabled = true;
                 connectButton.Enabled = false;
+                
+            }
+            catch (Exception ex)
+            {
+                selectDropdownButton.Enabled = false;
+                MessageBox.Show(ex.Message, Properties.Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            finally
+            {
                 toolStripStatusLabel1.Text = Properties.Resources.Ready;
                 toolStripProgressBar1.Value = 0;
                 listView1.UseWaitCursor = false;

GitlabCleaner/Properties/Resources.Designer.cs

@@ -132,6 +132,9 @@
   <data name="DownloadingProjects" xml:space="preserve">
     <value>Czytanie projektów...</value>
   </data>
+  <data name="Error" xml:space="preserve">
+    <value>Błąd</value>
+  </data>
   <data name="Ready" xml:space="preserve">
     <value>Gotowy.</value>
   </data>

GitlabCleaner/Properties/Resources.pl-PL.resx

@@ -132,6 +132,9 @@
   <data name="DownloadingProjects" xml:space="preserve">
     <value>Reading projects...</value>
   </data>
+  <data name="Error" xml:space="preserve">
+    <value>Error</value>
+  </data>
   <data name="Ready" xml:space="preserve">
     <value>Ready.</value>
   </data>

GitlabCleaner/Properties/Resources.resx

@@ -5,9 +5,6 @@
     <Setting Name="url" Type="(Web Service URL)" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="username" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="apikey" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>

GitlabCleaner/Properties/Settings.Designer.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 
@@ -15,22 +14,39 @@ public SettingsForm()
 
         private async void verifyButton_Click(object sender, EventArgs e)
         {
-            GitLabApiClient.GitLabClient client = new GitLabApiClient.GitLabClient(urlTextBox.Text, apikeyTextBox.Text);
-            Task<GitLabApiClient.Models.Users.Responses.Session> sessionTask = client.Users.GetCurrentSessionAsync();
-
-            GitLabApiClient.Models.Users.Responses.Session response = await sessionTask.ConfigureAwait(true);
-
-            pictureBox1.ImageLocation = response.AvatarUrl;
-            pictureBox1.LoadAsync();
-            MessageBox.Show(String.Format(CultureInfo.CurrentCulture, Properties.Resources.TestingSucceeded, response.Name));
+            try
+            {
+                GitLabApiClient.GitLabClient client = new GitLabApiClient.GitLabClient(urlTextBox.Text, apikeyTextBox.Text);
+                GitLabApiClient.Models.Users.Responses.Session response = await client.Users.GetCurrentSessionAsync().ConfigureAwait(true);
+                pictureBox1.Visible = false;
+                pictureBox1.ImageLocation = response.AvatarUrl;
+                pictureBox1.LoadAsync();
+                MessageBox.Show(String.Format(CultureInfo.CurrentCulture, Properties.Resources.TestingSucceeded, response.Name));
+                saveButton.Enabled = true;
+            }
+            catch (Exception ex)
+            {
+                saveButton.Enabled = false;
+                MessageBox.Show(ex.Message, Properties.Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
         }
 
         private void saveButton_Click(object sender, EventArgs e)
         {
             Properties.Settings.Default.url = urlTextBox.Text;
-            Properties.Settings.Default.username = usernameTextBox.Text;
             Properties.Settings.Default.apikey = apikeyTextBox.Text;
             Properties.Settings.Default.Save();
         }
+
+        private void urlTextBox_TextChanged(object sender, EventArgs e)
+        {
+            verifyButton.Enabled = urlTextBox.Text.Length > 0 && apikeyTextBox.Text.Length > 0;
+        }
+
+        private void pictureBox1_LoadCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)
+        {
+            pictureBox1.Visible = true;
+        }
     }
 }