Refactor the Linux version to not store sudo password

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -784,28 +784,6 @@
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
 
-                    <TextBlock
-                        x:Name="labLinuxSudoPassword"
-                        Grid.Row="7"
-                        Grid.Column="0"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbSettingsLinuxSudoPassword}" />
-                    <TextBox
-                        x:Name="txtLinuxSudoPassword"
-                        Grid.Row="7"
-                        Grid.Column="1"
-                        Width="200"
-                        Margin="{StaticResource Margin4}"
-                        HorizontalAlignment="Left" />
-                    <TextBlock
-                        x:Name="labLinuxSudoPasswordTip"
-                        Grid.Row="7"
-                        Grid.Column="2"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbSettingsLinuxSudoPasswordTip}"
-                        TextWrapping="Wrap" />
                 </Grid>
             </TabItem>
 

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -153,7 +153,6 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
             this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunEnableExInbound, v => v.togEnableExInbound.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunEnableIPv6Address, v => v.togEnableIPv6Address.IsChecked).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.TunLinuxSudoPassword, v => v.txtLinuxSudoPassword.Text).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType2, v => v.cmbCoreType2.SelectedValue).DisposeWith(disposables);
@@ -170,10 +169,6 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
         {
             txbSettingsExceptionTip2.IsVisible = false;
 
-            txtLinuxSudoPassword.IsVisible = false;
-            labLinuxSudoPassword.IsVisible = false;
-            labLinuxSudoPasswordTip.IsVisible = false;
-
             labHide2TrayWhenClose.IsVisible = false;
             togHide2TrayWhenClose.IsVisible = false;
         }

v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs

@@ -4,9 +4,11 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
+using DialogHostAvalonia;
 using ReactiveUI;
 using Splat;
 using v2rayN.Desktop.Common;
+using static QRCoder.PayloadGenerator;
 
 namespace v2rayN.Desktop.Views;
 
@@ -81,6 +83,10 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
                     return false;
                 await AvaUtils.SetClipboardData(this, (string)obj);
                 break;
+
+            case EViewAction.PasswordInput:
+                return await PasswordInputAsync();
+                break;
         }
         return await Task.FromResult(true);
     }
@@ -96,6 +102,20 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
         }
     }
 
+    private async Task<bool> PasswordInputAsync()
+    {
+        var dialog = new SudoPasswordInputView();
+        var obj = await DialogHost.Show(dialog);
+        if (obj == null)
+        {
+            togEnableTun.IsChecked = false;
+            return false;
+        }
+
+        AppHandler.Instance.LinuxSudoPwd = obj.ToString() ?? string.Empty;
+        return true;
+    }
+
     private void TxtRunningServerDisplay_Tapped(object? sender, Avalonia.Input.TappedEventArgs e)
     {
         ViewModel?.TestServerAvailability();

v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml

@@ -0,0 +1,70 @@
+<UserControl
+    x:Class="v2rayN.Desktop.Views.SudoPasswordInputView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    d:DesignHeight="200"
+    d:DesignWidth="400"
+    mc:Ignorable="d">
+    <DockPanel Margin="{StaticResource Margin8}">
+
+        <Border
+            Margin="{StaticResource Margin4}"
+            VerticalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Theme="{DynamicResource CardBorder}">
+
+            <StackPanel
+                Margin="{StaticResource Margin4}"
+                HorizontalAlignment="Center"
+                Orientation="Horizontal">
+                <Button
+                    x:Name="btnSave"
+                    Width="100"
+                    Content="{x:Static resx:ResUI.TbConfirm}"
+                    Cursor="Hand"
+                    IsDefault="True" />
+                <Button
+                    x:Name="btnCancel"
+                    Width="100"
+                    Margin="{StaticResource MarginLr8}"
+                    Content="{x:Static resx:ResUI.TbCancel}"
+                    Cursor="Hand"
+                    IsCancel="True" />
+            </StackPanel>
+        </Border>
+
+        <Border
+            Margin="{StaticResource Margin4}"
+            VerticalAlignment="Center"
+            Theme="{DynamicResource CardBorder}">
+
+            <Grid ColumnDefinitions="Auto,400" RowDefinitions="Auto,Auto,Auto">
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
+                    Text="{x:Static resx:ResUI.TbSettingsLinuxSudoPassword}" />
+
+                <TextBox
+                    x:Name="txtPassword"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="{StaticResource Margin4}"
+                    Classes="revealPasswordButton"
+                    Focusable="True" />
+
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
+                    Text="{x:Static resx:ResUI.TbSettingsLinuxSudoPasswordTip}"
+                    TextWrapping="Wrap" />
+            </Grid>
+        </Border>
+    </DockPanel>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs

@@ -0,0 +1,33 @@
+using Avalonia.Controls;
+using Avalonia.Threading;
+using DialogHostAvalonia;
+
+namespace v2rayN.Desktop.Views;
+
+public partial class SudoPasswordInputView : UserControl
+{
+    public SudoPasswordInputView()
+    {
+        InitializeComponent();
+
+        this.Loaded += (s, e) => txtPassword.Focus();
+
+        btnSave.Click += (_, _) =>
+        {
+            if (string.IsNullOrEmpty(txtPassword.Text))
+            {
+                txtPassword.Focus();
+                return;
+            }
+            Dispatcher.UIThread.Post(() =>
+            {
+                DialogHost.Close(null, txtPassword.Text);
+            });
+        };
+
+        btnCancel.Click += (_, _) =>
+        {
+            DialogHost.Close(null);
+        };
+    }
+}