Skip to content

Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic

fixed GUI doesn't preserve proxy settting

Sourav Kalal0763f4660268
diff --git a/gui/ViewModels/MainWindowViewModel.cs b/gui/ViewModels/MainWindowViewModel.cs
index 26fff83..05c3aaf 100644
--- a/gui/ViewModels/MainWindowViewModel.cs
+++ b/gui/ViewModels/MainWindowViewModel.cs
@@ -27,6 +27,10 @@ public class MainWindowViewModel : ViewModelBase
private Window? _mainWindow;
private ProxyBridgeService? _proxyService;
+ private string _currentProxyType = "SOCKS5";
+ private string _currentProxyIp = "";
+ private string _currentProxyPort = "";
+
public void SetMainWindow(Window window)
{
_mainWindow = window;
@@ -180,12 +184,19 @@ public class MainWindowViewModel : ViewModelBase
var window = new ProxySettingsWindow();
var viewModel = new ProxySettingsViewModel(
+ initialType: _currentProxyType,
+ initialIp: _currentProxyIp,
+ initialPort: _currentProxyPort,
onSave: (type, ip, port) =>
{
if (_proxyService != null && ushort.TryParse(port, out ushort portNum))
{
if (_proxyService.SetProxyConfig(type, ip, portNum))
{
+
+ _currentProxyType = type;
+ _currentProxyIp = ip;
+ _currentProxyPort = port;
ActivityLog += $"[{DateTime.Now:HH:mm:ss}] Saved proxy settings: {type} {ip}:{port}\n";
}
else
diff --git a/gui/ViewModels/ProxySettingsViewModel.cs b/gui/ViewModels/ProxySettingsViewModel.cs
index 7a645f0..e82761e 100644
--- a/gui/ViewModels/ProxySettingsViewModel.cs
+++ b/gui/ViewModels/ProxySettingsViewModel.cs
@@ -67,11 +67,15 @@ public class ProxySettingsViewModel : ViewModelBase
return domainRegex.IsMatch(input);
}
- public ProxySettingsViewModel(Action<string, string, string> onSave, Action onClose)
+ public ProxySettingsViewModel(string initialType, string initialIp, string initialPort, Action<string, string, string> onSave, Action onClose)
{
_onSave = onSave;
_onClose = onClose;
+ ProxyType = initialType;
+ ProxyIp = initialIp;
+ ProxyPort = initialPort;
+
SaveCommand = new RelayCommand(() =>
{
bool isValid = true;
diff --git a/gui/Views/ProxySettingsWindow.axaml b/gui/Views/ProxySettingsWindow.axaml
index ddbee33..92c7508 100644
--- a/gui/Views/ProxySettingsWindow.axaml
+++ b/gui/Views/ProxySettingsWindow.axaml
@@ -87,8 +87,7 @@
<StackPanel Margin="24,20" Spacing="20">
<StackPanel Spacing="6">
<TextBlock Text="Proxy Type" Classes="label"/>
- <ComboBox SelectedIndex="0"
- HorizontalAlignment="Stretch"
+ <ComboBox HorizontalAlignment="Stretch"
x:Name="ProxyTypeComboBox">
<ComboBoxItem Content="SOCKS5" Tag="SOCKS5"/>
<ComboBoxItem Content="HTTP" Tag="HTTP"/>
diff --git a/gui/Views/ProxySettingsWindow.axaml.cs b/gui/Views/ProxySettingsWindow.axaml.cs
index dab3386..6ce7992 100644
--- a/gui/Views/ProxySettingsWindow.axaml.cs
+++ b/gui/Views/ProxySettingsWindow.axaml.cs
@@ -1,4 +1,5 @@
using Avalonia.Controls;
+using Avalonia.Interactivity;
using ProxyBridge.GUI.ViewModels;
namespace ProxyBridge.GUI.Views;
@@ -9,28 +10,32 @@ public partial class ProxySettingsWindow : Window
{
InitializeComponent();
- // Handle save with proper ProxyType value
this.Opened += (s, e) =>
{
if (DataContext is ProxySettingsViewModel vm)
{
- var originalSave = vm.SaveCommand;
-
- // Override to get the actual selected type
- this.FindControl<ComboBox>("ProxyTypeComboBox")!.SelectionChanged += (_, __) =>
+ var comboBox = this.FindControl<ComboBox>("ProxyTypeComboBox");
+ if (comboBox != null)
{
- var combo = this.FindControl<ComboBox>("ProxyTypeComboBox");
- if (combo?.SelectedItem is ComboBoxItem item && item.Tag is string tag)
+ foreach (var obj in comboBox.Items)
{
- vm.ProxyType = tag;
+ if (obj is ComboBoxItem item && item.Tag is string tag && tag == vm.ProxyType)
+ {
+ comboBox.SelectedItem = item;
+ break;
+ }
}
- };
- // Set initial value
- var comboBox = this.FindControl<ComboBox>("ProxyTypeComboBox");
- if (comboBox?.SelectedItem is ComboBoxItem initialItem && initialItem.Tag is string initialTag)
- {
- vm.ProxyType = initialTag;
+ comboBox.SelectionChanged += (sender, args) =>
+ {
+ if (DataContext is ProxySettingsViewModel vm2)
+ {
+ if (comboBox.SelectedItem is ComboBoxItem sel && sel.Tag is string selTag)
+ {
+ vm2.ProxyType = selTag;
+ }
+ }
+ };
}
}
};