Skip to content

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

Fixed #13 Rule Protocol and Action not changed due to state not updated during model reload

Sourav Kalalcd45836df2cb
diff --git a/gui/Views/ProxyRulesWindow.axaml b/gui/Views/ProxyRulesWindow.axaml
index 326b8ee..76df5a8 100644
--- a/gui/Views/ProxyRulesWindow.axaml
+++ b/gui/Views/ProxyRulesWindow.axaml
@@ -311,8 +311,7 @@
<!-- Protocol Section -->
<StackPanel Spacing="6">
<TextBlock Text="Protocol" Classes="label"/>
- <ComboBox SelectedIndex="0"
- HorizontalAlignment="Stretch"
+ <ComboBox HorizontalAlignment="Stretch"
x:Name="ProtocolComboBox">
<ComboBoxItem Content="TCP" Tag="TCP"/>
<ComboBoxItem Content="UDP" Tag="UDP"/>
@@ -323,8 +322,7 @@
<!-- Action Section -->
<StackPanel Spacing="6">
<TextBlock Text="Action" Classes="label"/>
- <ComboBox SelectedIndex="0"
- HorizontalAlignment="Stretch"
+ <ComboBox HorizontalAlignment="Stretch"
x:Name="ActionComboBox"
SelectionChanged="ActionComboBox_SelectionChanged">
<ComboBoxItem Content="PROXY" Tag="PROXY"/>
diff --git a/gui/Views/ProxyRulesWindow.axaml.cs b/gui/Views/ProxyRulesWindow.axaml.cs
index b2293ee..dbd1b6d 100644
--- a/gui/Views/ProxyRulesWindow.axaml.cs
+++ b/gui/Views/ProxyRulesWindow.axaml.cs
@@ -1,3 +1,5 @@
+using System;
+using System.ComponentModel;
using Avalonia.Controls;
using Avalonia.Interactivity;
using ProxyBridge.GUI.ViewModels;
@@ -6,6 +8,8 @@ namespace ProxyBridge.GUI.Views;
public partial class ProxyRulesWindow : Window
{
+ private bool _isUpdatingFromViewModel = false;
+
public ProxyRulesWindow()
{
InitializeComponent();
@@ -14,10 +18,89 @@ public partial class ProxyRulesWindow : Window
{
protocolComboBox.SelectionChanged += ProtocolComboBox_SelectionChanged;
}
+
+ this.DataContextChanged += ProxyRulesWindow_DataContextChanged;
+ }
+
+ private void ProxyRulesWindow_DataContextChanged(object? sender, EventArgs e)
+ {
+ if (DataContext is ProxyRulesViewModel vm)
+ {
+ vm.PropertyChanged += ViewModel_PropertyChanged;
+
+ UpdateComboBoxSelections(vm);
+ }
+ }
+
+ private void ViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+ {
+ if (sender is ProxyRulesViewModel vm)
+ {
+ if (e.PropertyName == nameof(ProxyRulesViewModel.NewProtocol))
+ {
+ UpdateProtocolComboBox(vm.NewProtocol);
+ }
+ else if (e.PropertyName == nameof(ProxyRulesViewModel.NewProxyAction))
+ {
+ UpdateActionComboBox(vm.NewProxyAction);
+ }
+ }
+ }
+
+ private void UpdateComboBoxSelections(ProxyRulesViewModel vm)
+ {
+ UpdateProtocolComboBox(vm.NewProtocol);
+ UpdateActionComboBox(vm.NewProxyAction);
+ }
+
+ private void UpdateProtocolComboBox(string protocol)
+ {
+ if (this.FindControl<ComboBox>("ProtocolComboBox") is ComboBox protocolComboBox)
+ {
+ _isUpdatingFromViewModel = true;
+
+ foreach (var item in protocolComboBox.Items)
+ {
+ if (item is ComboBoxItem comboBoxItem &&
+ comboBoxItem.Tag is string tag &&
+ tag.Equals(protocol, StringComparison.OrdinalIgnoreCase))
+ {
+ protocolComboBox.SelectedItem = comboBoxItem;
+ break;
+ }
+ }
+
+ _isUpdatingFromViewModel = false;
+ }
+ }
+
+ private void UpdateActionComboBox(string action)
+ {
+ if (this.FindControl<ComboBox>("ActionComboBox") is ComboBox actionComboBox)
+ {
+ _isUpdatingFromViewModel = true;
+
+ foreach (var item in actionComboBox.Items)
+ {
+ if (item is ComboBoxItem comboBoxItem &&
+ comboBoxItem.Tag is string tag &&
+ tag.Equals(action, StringComparison.OrdinalIgnoreCase))
+ {
+ actionComboBox.SelectedItem = comboBoxItem;
+ break;
+ }
+ }
+
+ _isUpdatingFromViewModel = false;
+ }
}
private void ActionComboBox_SelectionChanged(object? sender, SelectionChangedEventArgs e)
{
+ // dont update ViewModel when updating from Viewmodel
+ if (_isUpdatingFromViewModel)
+ return;
+
if (sender is ComboBox comboBox &&
comboBox.SelectedItem is ComboBoxItem item &&
item.Tag is string tag &&
@@ -29,6 +112,9 @@ public partial class ProxyRulesWindow : Window
private void ProtocolComboBox_SelectionChanged(object? sender, SelectionChangedEventArgs e)
{
+ if (_isUpdatingFromViewModel)
+ return;
+
if (sender is ComboBox comboBox &&
comboBox.SelectedItem is ComboBoxItem item &&
item.Tag is string tag &&