Bug fix for IsAdministrator

This reverts commit 7618f9f.
2dust · Oct 13, 2024 · 4eb443e · 4eb443e
1 parent e530789
commit 4eb443e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/v2rayN/ServiceLib/Handler/AppHandler.cs b/v2rayN/ServiceLib/Handler/AppHandler.cs
@@ -2,11 +2,14 @@
 {
     public sealed class AppHandler
     {
+        #region Property
+
         private static readonly Lazy<AppHandler> _instance = new(() => new());
         private Config _config;
         private int? _statePort;
         private int? _statePort2;
         private Job? _processJob;
+        private bool? _isAdministrator;
         public static AppHandler Instance => _instance.Value;
         public Config Config => _config;
 
@@ -28,6 +31,17 @@ public int StatePort2
             }
         }
 
+        public bool IsAdministrator
+        {
+            get
+            {
+                _isAdministrator ??= Utils.IsAdministrator();
+                return _isAdministrator.Value;
+            }
+        }
+
+        #endregion Property
+
         #region Init
 
         public AppHandler()

diff --git a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@@ -10,8 +10,6 @@ namespace ServiceLib.ViewModels
 {
     public class StatusBarViewModel : MyReactiveObject
     {
-        private bool _isAdministrator { get; set; }
-
         #region ObservableCollection
 
         private IObservableCollection<RoutingItem> _routingItems = new ObservableCollectionExtended<RoutingItem>();
@@ -119,8 +117,7 @@ public StatusBarViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
             SelectedRouting = new();
             SelectedServer = new();
 
-            _isAdministrator = Utils.IsAdministrator();
-            if (_config.tunModeItem.enableTun && _isAdministrator)
+            if (_config.tunModeItem.enableTun && AppHandler.Instance.IsAdministrator)
             {
                 EnableTun = true;
             }
@@ -414,7 +411,7 @@ private void DoEnableTun(bool c)
             {
                 _config.tunModeItem.enableTun = EnableTun;
                 // When running as a non-administrator, reboot to administrator mode
-                if (EnableTun && !_isAdministrator)
+                if (EnableTun && !AppHandler.Instance.IsAdministrator)
                 {
                     _config.tunModeItem.enableTun = false;
                     Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin();

diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -103,7 +103,7 @@ public MainWindow()
                 }
             });
 
-            this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
+            this.Title = $"{Utils.GetVersion()} - {(AppHandler.Instance.IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
             if (Utils.IsWindows())
             {
                 menuGlobalHotkeySetting.IsVisible = false;

diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -122,7 +122,7 @@ public MainWindow()
                 }
             });
 
-            this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
+            this.Title = $"{Utils.GetVersion()} - {(AppHandler.Instance.IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
 
             if (!_config.guiItem.enableHWA)
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,7 +122,7 @@ public MainWindow() @@
                     }
                 });
-                this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
+                this.Title = $"{Utils.GetVersion()} - {(AppHandler.Instance.IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
                 if (!_config.guiItem.enableHWA)
                 {
@@ Expand Down @@