Fixed #58 issue 🐛

Fixed Windows G Defender bug.
Sophia-Community · Apr 29, 2022 · cb411a8 · cb411a8
1 parent 3671e3b
commit cb411a8
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/SophiApp/SophiApp/Helpers/OsHelper.cs b/SophiApp/SophiApp/Helpers/OsHelper.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace SophiApp.Helpers
@@ -32,6 +31,7 @@ internal class OsHelper
         private const int TIMEOUT_3_SECONDS = 3000;
         private const string TRAY_SETTINGS = "TraySettings";
         private const string UBR = "UBR";
+        private const string WIN_ENTERPRISE_G = "EnterpriseG";
         private const uint WIN11_BUILD_NUMBER = 22;
         private const string WINLOGON_PATH = @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon";
         private const int WM_SETTINGCHANGE = 0x1a;
@@ -50,6 +50,8 @@ internal class OsHelper
         internal const uint WIN11_MIN_SUPPORTED_INSIDER_BUILD = 22509;
         internal const uint WIN11_MIN_SUPPORTED_UBR = 556;
 
+        internal static bool IsEnterpriseG = GetEdition() == WIN_ENTERPRISE_G;
+
         private static WindowsIdentity GetCurrentUser() => WindowsIdentity.GetCurrent();
 
         [DllImport("user32.dll", SetLastError = true)]

diff --git a/SophiApp/SophiApp/Helpers/VisualRedistrLibsHelper.cs b/SophiApp/SophiApp/Helpers/VisualRedistrLibsHelper.cs
@@ -16,14 +16,6 @@ internal class VisualRedistrLibsHelper
         private const string VERSION_NAME = "Version";
         private const string X64 = "x64";
 
-        private static string GetRegistryPropertyValue(string propertyName)
-        {
-            var registryData = RegHelper.GetSubKeyNames(RegistryHive.ClassesRoot, REDISTRX64_REGISTRY_PATH)
-                                        .FirstOrDefault(key => key.Contains(REDISTRX64_REGISTRY_NAME_PATTERN));
-
-            return RegHelper.GetValue(RegistryHive.ClassesRoot, registryData, propertyName) as string;
-        }
-
         internal static Version GetCloudLatestVersion()
         {
             var cloudLibsData = WebHelper.GetJsonResponse<CPPRedistrCollection>(CLOUD_VC_VERSION_URL);
@@ -32,7 +24,10 @@ internal static Version GetCloudLatestVersion()
 
         internal static Version GetInstalledVersion()
         {
-            var version = IsInstalled() ? GetRegistryPropertyValue(VERSION_NAME) : "0.0.0.0";
+            var registryData = RegHelper.GetSubKeyNames(RegistryHive.ClassesRoot, REDISTRX64_REGISTRY_PATH)
+                                        .FirstOrDefault(key => key.Contains(REDISTRX64_REGISTRY_NAME_PATTERN));
+
+            var version = registryData is null ? "0.0.0.0" : RegHelper.GetValue(RegistryHive.ClassesRoot, registryData, VERSION_NAME) as string;
             return Version.Parse(version);
         }
 

diff --git a/SophiApp/SophiApp/Resources/UIData.json b/SophiApp/SophiApp/Resources/UIData.json
@@ -4198,4 +4198,4 @@
     "Windows10Supported": true,
     "Windows11Supported": false
   }
-]
+]
diff --git a/SophiApp/SophiApp/StartupConditions/DefenderNotCorruptedCondition.cs b/SophiApp/SophiApp/StartupConditions/DefenderNotCorruptedCondition.cs
@@ -13,7 +13,7 @@ internal class DefenderNotCorruptedCondition : IStartupCondition
 
         public bool Invoke()
         {
-            if (WindowsDefenderHelper.DisabledByGroupPolicy() || WmiHelper.HasExternalAntiVirus())
+            if (OsHelper.IsEnterpriseG || WindowsDefenderHelper.DisabledByGroupPolicy() || WmiHelper.HasExternalAntiVirus())
             {
                 return HasProblem;
             }

diff --git a/SophiApp/SophiApp/StartupConditions/DefenderWarningCondition.cs b/SophiApp/SophiApp/StartupConditions/DefenderWarningCondition.cs
@@ -11,6 +11,11 @@ internal class DefenderWarningCondition : IStartupCondition
 
         public bool Invoke()
         {
+            if (OsHelper.IsEnterpriseG)
+            {
+                return HasProblem;
+            }
+
             if (WindowsDefenderHelper.DisabledByGroupPolicy().Invert())
             {
                 if (WmiHelper.HasExternalAntiVirus())

diff --git a/SophiApp/SophiApp/ViewModels/Methods.cs b/SophiApp/SophiApp/ViewModels/Methods.cs
@@ -241,8 +241,8 @@ private void InitializeProperties()
         }
 
         private async Task InitializeTextedElements(string tag) => await Task.Run(() => TextedElements.Where(element => element.Tag == tag)
-                                                                                                                                        .ToList()
-                                                                                                                                        .ForEach(element => element.Initialize()));
+                                                                                                                                          .ToList()
+                                                                                                                                          .ForEach(element => element.Initialize()));
 
         private async Task InitializeTextedElementsAsync()
         {