Fix endless recursion in the privacy menu

Fixes #193

Author: Trolldemorted

Signal-Windows/ViewModels/NotificationSettingsPageViewModel.cs

@@ -43,15 +43,21 @@ public void OnNavigatedTo()
         {
             var showNotificationTextSettings = GlobalSettingsManager.ShowNotificationTextSetting;
             if (showNotificationTextSettings == GlobalSettingsManager.ShowNotificationTextSettings.NameAndMessage)
-            {
+            {
+                NameOnlyChecked = false;
+                NoNameOrMessageChecked = false;
                 NameAndMessageChecked = true;
             }
             else if (showNotificationTextSettings == GlobalSettingsManager.ShowNotificationTextSettings.NameOnly)
-            {
+            {
+                NameAndMessageChecked = false;
+                NoNameOrMessageChecked = false;
                 NameOnlyChecked = true;
             }
             else if (showNotificationTextSettings == GlobalSettingsManager.ShowNotificationTextSettings.NoNameOrMessage)
-            {
+            {
+                NameOnlyChecked = false;
+                NameAndMessageChecked = false;
                 NoNameOrMessageChecked = true;
             }
         }

Signal-Windows/Views/NotificationSettingsPage.xaml

@@ -23,9 +23,9 @@
                 </Grid.RowDefinitions>
                 <StackPanel>
                     <TextBlock Text="Show" Style="{StaticResource BodyTextBlockStyle}" Margin="0,0,0,6"/>
-                    <RadioButton Content="Name and message" Tag="{x:Bind Vm.NameAndMessageTag}" Margin="0,6" IsChecked="{x:Bind Vm.NameAndMessageChecked, Mode=TwoWay}" Checked="ShowNotificationText_Checked"/>
-                    <RadioButton Content="Name only" Tag="{x:Bind Vm.NameOnlyTag}" Margin="0,6" IsChecked="{x:Bind Vm.NameOnlyChecked, Mode=TwoWay}" Checked="ShowNotificationText_Checked"/>
-                    <RadioButton Content="No name or message" Tag="{x:Bind Vm.NoNameOrMessageTag}" Margin="0,6" IsChecked="{x:Bind Vm.NoNameOrMessageChecked, Mode=TwoWay}" Checked="ShowNotificationText_Checked"/>
+                    <RadioButton Content="Name and message" Tag="{x:Bind Vm.NameAndMessageTag}" Margin="0,6" IsChecked="{x:Bind Vm.NameAndMessageChecked, Mode=OneWay}" Checked="ShowNotificationText_Checked" />
+                    <RadioButton Content="Name only" Tag="{x:Bind Vm.NameOnlyTag}" Margin="0,6" IsChecked="{x:Bind Vm.NameOnlyChecked, Mode=OneWay}" Checked="ShowNotificationText_Checked" />
+                    <RadioButton Content="No name or message" Tag="{x:Bind Vm.NoNameOrMessageTag}" Margin="0,6" IsChecked="{x:Bind Vm.NoNameOrMessageChecked, Mode=OneWay}" Checked="ShowNotificationText_Checked" />
                 </StackPanel>
                 <HyperlinkButton Grid.Row="1" Margin="0,16,0,0" NavigateUri="ms-settings:notifications" Content="More notification settings"/>
             </Grid>

Signal-Windows/Views/NotificationSettingsPage.xaml.cs

@@ -27,7 +27,7 @@ public sealed partial class NotificationSettingsPage : Page
     {
         public NotificationSettingsPage()
         {
-            this.InitializeComponent();
+            this.InitializeComponent();
         }
 
         public NotificationSettingsPageViewModel Vm
@@ -60,19 +60,28 @@ private void ShowNotificationText_Checked(object sender, RoutedEventArgs e)
             var radioButton = sender as RadioButton;
             string tag = radioButton.Tag.ToString();
             if (tag == Vm.NameAndMessageTag)
-            {
-                Vm.NameAndMessageChecked = true;
-                GlobalSettingsManager.ShowNotificationTextSetting = GlobalSettingsManager.ShowNotificationTextSettings.NameAndMessage;
+            {
+                if (GlobalSettingsManager.ShowNotificationTextSetting != GlobalSettingsManager.ShowNotificationTextSettings.NameAndMessage)
+                {
+                    GlobalSettingsManager.ShowNotificationTextSetting = GlobalSettingsManager.ShowNotificationTextSettings.NameAndMessage;
+                    Vm.NameAndMessageChecked = true;
+                }
             }
             else if (tag == Vm.NameOnlyTag)
-            {
-                Vm.NameOnlyChecked = true;
-                GlobalSettingsManager.ShowNotificationTextSetting = GlobalSettingsManager.ShowNotificationTextSettings.NameOnly;
+            {
+                if (GlobalSettingsManager.ShowNotificationTextSetting != GlobalSettingsManager.ShowNotificationTextSettings.NameOnly)
+                {
+                    GlobalSettingsManager.ShowNotificationTextSetting = GlobalSettingsManager.ShowNotificationTextSettings.NameOnly;
+                    Vm.NameOnlyChecked = true;
+                }
             }
             else if (tag == Vm.NoNameOrMessageTag)
-            {
-                Vm.NoNameOrMessageChecked = true;
-                GlobalSettingsManager.ShowNotificationTextSetting = GlobalSettingsManager.ShowNotificationTextSettings.NoNameOrMessage;
+            {
+                if (GlobalSettingsManager.ShowNotificationTextSetting != GlobalSettingsManager.ShowNotificationTextSettings.NoNameOrMessage)
+                {
+                    GlobalSettingsManager.ShowNotificationTextSetting = GlobalSettingsManager.ShowNotificationTextSettings.NoNameOrMessage;
+                    Vm.NoNameOrMessageChecked = true;
+                }
             }
         }
     }