Fix issues

Author: georgii-borovinskikh-sonarsource

src/ConnectedMode/Persistence/AggregatingSolutionBindingCredentialsLoader.cs

@@ -42,12 +42,9 @@ public AggregatingSolutionBindingCredentialsLoader(
     {
         this.credentialStoreTypeProvider = credentialStoreTypeProvider;
         this.logger = logger.ForVerboseContext(nameof(AggregatingSolutionBindingCredentialsLoader));
-        credentialStoreTypeProvider.Changed += CredentialStoreTypeProviderOnChanged;
         solutionBindingCredentialsLoaderImpls = impls.ToDictionary(x => x.StoreType, y => y);
     }
 
-    private void CredentialStoreTypeProviderOnChanged(object sender, EventArgs e) => Clear();
-
     public void DeleteCredentials(Uri boundServerUri) =>
         SafeExecute(() =>
         {
@@ -81,6 +78,8 @@ public void Clear()
 
     private void SafeExecute(Action act, [CallerMemberName] string caller = "")
     {
+        logger.LogVerbose(GetContext(caller), "Executing Credential Operation");
+
         try
         {
             act();

src/ConnectedMode/Persistence/ISolutionBindingCredentialsLoader.cs

@@ -42,42 +42,15 @@ public interface ISolutionBindingCredentialsLoaderImpl : ISolutionBindingCredent
 
     public interface ICredentialStoreTypeProvider
     {
-        CredentialStoreType CredentialStoreType { get; set; }
-
-        event EventHandler Changed;
+        CredentialStoreType CredentialStoreType { get; }
     }
 
     [Export(typeof(ICredentialStoreTypeProvider))]
     [PartCreationPolicy(CreationPolicy.Shared)]
-    public class CredentialStoreTypeProvider : ICredentialStoreTypeProvider
+    [method: ImportingConstructor]
+    public class CredentialStoreTypeProvider(ISonarLintSettings sonarLintSettings) : ICredentialStoreTypeProvider
     {
-        private readonly object locker = new object();
-        private CredentialStoreType credentialStoreType;
-
-        public CredentialStoreType CredentialStoreType
-        {
-            get
-            {
-                lock (locker)
-                {
-                    return credentialStoreType;
-                }
-            }
-            set
-            {
-                lock (locker)
-                {
-                    if (credentialStoreType == value)
-                    {
-                        return;
-                    }
-                    credentialStoreType = value;
-                }
-                Changed?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        public event EventHandler Changed;
+        public CredentialStoreType CredentialStoreType { get; } = sonarLintSettings.CredentialStoreType;
     }
 
 }

src/Integration.Vsix/Settings/GeneralOptionsDialogControl.xaml

@@ -66,7 +66,7 @@
         </StackPanel>
 
         <StackPanel Grid.Column="0" x:Name="CredentialStorePanel" Grid.Row="3" Grid.ColumnSpan="2" Margin="5">
-            <TextBlock Text="Credential Store Type:" />
+            <TextBlock Text="Credential Store Type (RESTART TO APPLY):" />
 
             <ComboBox SelectedIndex="0" HorizontalContentAlignment="Stretch" Margin="0,5,0,0" Padding="5,2.5"
                       ItemsSource="{Binding Path=CredentialStoreTypes}" SelectedItem="{Binding Path=CredentialStoreType}" />

src/Integration.Vsix/Settings/GeneralOptionsDialogControlViewModel.cs

@@ -105,6 +105,7 @@ public GeneralOptionsDialogControlViewModel(
         IsActivateMoreEnabled = slSettings.IsActivateMoreEnabled;
         JreLocation = slSettings.JreLocation;
         ShowCloudRegion = slSettings.ShowCloudRegion;
+        CredentialStoreType = slSettings.CredentialStoreType;
     }
 
     public void SaveSettings()
@@ -114,8 +115,6 @@ public void SaveSettings()
         slSettings.JreLocation = JreLocation?.Trim();
         slSettings.ShowCloudRegion = ShowCloudRegion;
         slSettings.CredentialStoreType = CredentialStoreType;
-
-        credentialStoreTypeProvider.CredentialStoreType = CredentialStoreType;
     }
 
     internal void ViewInBrowser(string url) => browserService.Navigate(url);