Update MainWindowViewModel.cs

bitbeans · Apr 11, 2020 · 60eb53a · 60eb53a
1 parent 04d61f0
commit 60eb53a
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/CleanBrowsingClient/ViewModels/MainWindowViewModel.cs b/src/CleanBrowsingClient/ViewModels/MainWindowViewModel.cs
@@ -86,10 +86,7 @@ public string UpdateProgressStatus
             set { SetProperty(ref _updateProgressStatus, value); }
         }
 
-        public bool IsProtected
-        {
-            get { return _isCustomFilterEnabled || _isFamilyFilterEnabled || _isAdultFilterEnabled; }
-        }
+        public bool IsProtected => _isCustomFilterEnabled || _isFamilyFilterEnabled || _isAdultFilterEnabled;
 
         public string IsProtectedText
         {
@@ -99,11 +96,11 @@ public string IsProtectedText
                 {
                     return "Status: ACTIVE. You are protected by Custom Filter.";
                 }
-                else if (_isFamilyFilterEnabled)
+                if (_isFamilyFilterEnabled)
                 {
                     return "Status: ACTIVE. You are protected by Free Family Filter.";
                 }
-                else if (_isAdultFilterEnabled)
+                if (_isAdultFilterEnabled)
                 {
                     return "Status: ACTIVE. You are protected by Free Adult Filter.";
                 }
@@ -662,7 +659,7 @@ public async void HandleCustomStamp()
         {
             try
             {
-                var stamp = _appConfiguration.Proxies.Where(p => p.Name.Equals(Global.DefaultCustomFilterKey)).FirstOrDefault();
+                var stamp = _appConfiguration.Proxies.FirstOrDefault(p => p.Name.Equals(Global.DefaultCustomFilterKey));
                 if (stamp == null)
                 {
                     _regionManager.RequestNavigate("ContentRegion", "StampView");
@@ -867,7 +864,7 @@ private bool SetStaticStamp(string filter)
                         RemoveStaticStamps();
                         DnscryptProxyConfigurationManager.LoadConfiguration();
                         _dnscryptProxyConfiguration = DnscryptProxyConfigurationManager.DnscryptProxyConfiguration;
-                        var stamp = _appConfiguration.Proxies.Where(p => p.Name.Equals(filter)).FirstOrDefault();
+                        var stamp = _appConfiguration.Proxies.FirstOrDefault(p => p.Name.Equals(filter));
                         if (stamp != null)
                         {
                             if (!string.IsNullOrEmpty(stamp.Stamp))