add empty field checks for test connection buttons in configs

Author: maxijabase

UI/Windows/ConfigWindow.xaml.cs

@@ -530,7 +530,19 @@ private void C_FTPDir_TextChanged(object sender, TextChangedEventArgs e)
 
         private async void FTPTestConnectionButton_Click(object sender, RoutedEventArgs e)
         {
-            ProgressDialogController? dialog = await this.ShowProgressAsync(Translate("TestingFTPConn"), Translate("PleaseWait"), settings: Program.MainWindow.MetroDialogOptions);
+            var dialog = await this.ShowProgressAsync(Translate("TestingFTPConn"), Translate("PleaseWait"), settings: Program.MainWindow.MetroDialogOptions);
+
+            var host = C_FTPHost.Text;
+            var user = C_FTPUser.Text;
+            var pw = C_FTPPW.Password;
+
+            if (string.IsNullOrEmpty(host) || string.IsNullOrEmpty(user) || string.IsNullOrEmpty(pw))
+            {
+                await dialog?.CloseAsync();
+                await this.ShowMessageAsync(Translate("Warning"), Translate("FTPFieldsEmpty"), settings: Program.MainWindow.MetroDialogOptions);
+                return;
+            }
+
             var ftp = new FTP(C_FTPHost.Text, C_FTPUser.Text, C_FTPPW.Password);
             dialog.SetIndeterminate();
             dialog.SetCancelable(true);
@@ -594,7 +606,20 @@ private void C_RConPW_TextChanged(object sender, RoutedEventArgs e)
 
         private async void RCONTestConnectionButton_Click(object sender, RoutedEventArgs e)
         {
-            ProgressDialogController? dialog = await this.ShowProgressAsync(Translate("TestingRCONConn"), Translate("PleaseWait"), settings: Program.MainWindow.MetroDialogOptions);
+            var success = true;
+            var errorMsg = "";
+            var dialog = await this.ShowProgressAsync(Translate("TestingRCONConn"), Translate("PleaseWait"), settings: Program.MainWindow.MetroDialogOptions);
+
+            var ip = C_RConIP.Text;
+            var port = C_RConPort.Text;
+
+            if (string.IsNullOrEmpty(ip) || string.IsNullOrEmpty(port))
+            {
+                success = false;
+                errorMsg = Translate("RCONFieldsEmpty");
+                goto End;
+            }
+
             dialog.SetIndeterminate();
             dialog.SetCancelable(true);
             dialog.Canceled += async delegate
@@ -603,9 +628,6 @@ private async void RCONTestConnectionButton_Click(object sender, RoutedEventArgs
                 return;
             };
 
-            var success = true;
-            var errorMsg = "";
-
             try
             {
                 var server = ServerQuery.GetServerInstance(C_RConIP.Text, ushort.Parse(C_RConPort.Text));

Utils/Models/FTP.cs

@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using Renci.SshNet;
 using Renci.SshNet.Common;
+using static SPCode.Interop.TranslationProvider;
 
 namespace SPCode.Utils
 {
@@ -51,7 +52,6 @@ public async Task<bool> TestConnection()
         {
             var requestUri = new UriBuilder(_host).Uri;
             var success = true;
-
             if (requestUri.Scheme == "sftp")
             {
                 var connectionInfo = new ConnectionInfo(requestUri.Host, requestUri.Port == -1 ? 22 : requestUri.Port, _user, new PasswordAuthenticationMethod(_user, _pass));
@@ -64,7 +64,7 @@ public async Task<bool> TestConnection()
                 catch (SshAuthenticationException)
                 {
                     success = false;
-                    ErrorMessage = "Invalid credentials!";
+                    ErrorMessage = Translate("InvalidCredentials");
                 }
                 catch (Exception ex)
                 {
@@ -77,7 +77,7 @@ public async Task<bool> TestConnection()
                     sftp.Dispose();
                 }
             }
-            else
+            else if (requestUri.Scheme == "ftp")
             {
                 var requestDir = WebRequest.Create(requestUri);
                 requestDir.Credentials = new NetworkCredential(_user, _pass);
@@ -86,11 +86,17 @@ public async Task<bool> TestConnection()
                 {
                     var response = await requestDir.GetResponseAsync();
                 }
-                catch
+                catch (Exception ex)
                 {
                     success = false;
+                    ErrorMessage = ex.Message;
                 }
             }
+            else
+            {
+                success = false;
+                ErrorMessage = Translate("InvalidFTPSchema");
+            }
             return success;
         }
     }