URI validation changes

Author: BornToBeRoot

Source/NETworkManager/Validators/HttpAndHttpsUriValidator.cs

@@ -1,19 +1,18 @@
-using NETworkManager.Helpers;
+using System;
 using System.Globalization;
-using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 
 namespace NETworkManager.Validators
 {
-    public class MACAddressValidator : ValidationRule
+    public class HttpAndHttpsUriValidator : ValidationRule
     {
         public override ValidationResult Validate(object value, CultureInfo cultureInfo)
-        {            
-            if (Regex.IsMatch(value as string, RegexHelper.MACAddressRegex))
+        {
+            if (Uri.TryCreate(value as string, UriKind.Absolute, out Uri uriResult) && (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps))
                 return ValidationResult.ValidResult;
 
-            return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidMACAddress"] as string);
+            return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidWebsiteUri"] as string);
         }
     }
 }

Source/NETworkManager/Validators/MACAddressValidator.cs

@@ -6,14 +6,14 @@
 
 namespace NETworkManager.Validators
 {
-    public class HttpAndHttpsUriValidator : ValidationRule
+    public class MACAddressValidator : ValidationRule
     {
         public override ValidationResult Validate(object value, CultureInfo cultureInfo)
-        {            
-            if (Regex.IsMatch(value as string, RegexHelper.httpAndHttpsUriRegex))
+        {
+            if (Regex.IsMatch(value as string, RegexHelper.MACAddressRegex))
                 return ValidationResult.ValidResult;
 
-            return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidWebsiteUri"] as string);
+            return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidMACAddress"] as string);
         }
     }
-}
+}