From d7a53da59fb95567278e2b0ee855ffe97c7b2ae1 Mon Sep 17 00:00:00 2001
From: PointStar <chaim.marcus@gmail.com>
Date: Tue, 9 Jun 2026 16:10:47 +0300
Subject: [PATCH] =?UTF-8?q?fix(sidebar):=20resolve=20MatchingService=20liv?=
 =?UTF-8?q?e=20+=20settings=20"=D7=A1=D7=92=D7=95=D7=A8"=20label?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sidebar lookups threw ObjectDisposedException on the EspoCrmClient's
HttpClient after any settings save. TryInitializeCrm rebuilds the CRM
stack (new HttpClient + MatchingService) and disposes the old HttpClient,
but the long-lived sidebar ReadingPaneViewModel had captured the old
MatchingService and kept calling into the disposed client.

ReadingPaneViewModel now resolves the MatchingService live on each lookup
via a Func<IMatchingService?> provider (() => host.MatchingService), so
it always uses the current stack and degrades gracefully (shows "not
configured") when none exists. SidebarController no longer captures a
snapshot.

Also: rename the Settings dialog's bottom button from "ביטול" to "סגור".

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../Dialogs/SettingsDialog.xaml               |  2 +-
 .../ViewModels/ReadingPaneViewModel.cs        | 31 ++++++++++++++++---
 src/OutlookAddin/Properties/AssemblyInfo.cs   |  4 +--
 src/OutlookAddin/Services/AddInHost.cs        |  1 -
 .../Services/SidebarController.cs             |  5 +--
 5 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/OutlookAddin.UI/Dialogs/SettingsDialog.xaml b/src/OutlookAddin.UI/Dialogs/SettingsDialog.xaml
index 19a094d..1bd3bab 100644
--- a/src/OutlookAddin.UI/Dialogs/SettingsDialog.xaml
+++ b/src/OutlookAddin.UI/Dialogs/SettingsDialog.xaml
@@ -152,7 +152,7 @@
                     MinWidth="100" />
             <Button Command="{Binding CancelCommand}"
                     IsCancel="True"
-                    Content="ביטול"
+                    Content="סגור"
                     Padding="20,5"
                     MinWidth="100" />
         </StackPanel>
diff --git a/src/OutlookAddin.UI/ViewModels/ReadingPaneViewModel.cs b/src/OutlookAddin.UI/ViewModels/ReadingPaneViewModel.cs
index 3bfed47..107587d 100644
--- a/src/OutlookAddin.UI/ViewModels/ReadingPaneViewModel.cs
+++ b/src/OutlookAddin.UI/ViewModels/ReadingPaneViewModel.cs
@@ -27,7 +27,12 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
 
     public sealed partial class ReadingPaneViewModel : ObservableObject
     {
-        private readonly IMatchingService _matchingService;
+        // Resolved live on each lookup rather than captured once: the host
+        // rebuilds the CRM stack (new HttpClient + MatchingService) whenever
+        // settings are saved and disposes the old HttpClient. A captured
+        // snapshot would then call into a disposed HttpClient and throw
+        // ObjectDisposedException on every sidebar lookup.
+        private readonly Func<IMatchingService?> _matchingServiceProvider;
         private readonly ILogger _logger;
         private CancellationTokenSource? _activeLookup;
         // Stashes the ambiguous MatchResult while the user is drilling into
@@ -94,9 +99,9 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
         /// </summary>
         public event EventHandler<string>? OpenInBrowserRequested;
 
-        public ReadingPaneViewModel(IMatchingService matchingService, ILogger logger)
+        public ReadingPaneViewModel(Func<IMatchingService?> matchingServiceProvider, ILogger logger)
         {
-            _matchingService = matchingService ?? throw new ArgumentNullException(nameof(matchingService));
+            _matchingServiceProvider = matchingServiceProvider ?? throw new ArgumentNullException(nameof(matchingServiceProvider));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
@@ -162,12 +167,20 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
             _ambiguousReturnTarget = null;
             State = ReadingPaneState.Loading;
 
+            var svc = _matchingServiceProvider();
+            if (svc == null)
+            {
+                ErrorMessage = "התוסף עדיין לא מוגדר. עדכן בהגדרות.";
+                State = ReadingPaneState.Error;
+                return;
+            }
+
             var cts = new CancellationTokenSource();
             _activeLookup = cts;
 
             try
             {
-                var result = await _matchingService.LookupAsync(senderEmail, cts.Token).ConfigureAwait(true);
+                var result = await svc.LookupAsync(senderEmail, cts.Token).ConfigureAwait(true);
                 if (cts.IsCancellationRequested) return;
 
                 if (result == null)
@@ -296,6 +309,14 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
         {
             if (candidate == null || string.IsNullOrWhiteSpace(candidate.Id)) return;
 
+            var svc = _matchingServiceProvider();
+            if (svc == null)
+            {
+                ErrorMessage = "התוסף עדיין לא מוגדר. עדכן בהגדרות.";
+                State = ReadingPaneState.Error;
+                return;
+            }
+
             CancelInFlight();
             var cts = new CancellationTokenSource();
             _activeLookup = cts;
@@ -310,7 +331,7 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
 
             try
             {
-                var result = await _matchingService.LookupContactAsync(candidate.Id, rememberedEmail, cts.Token).ConfigureAwait(true);
+                var result = await svc.LookupContactAsync(candidate.Id, rememberedEmail, cts.Token).ConfigureAwait(true);
                 if (cts.IsCancellationRequested) return;
 
                 if (result == null || result.Contact == null)
diff --git a/src/OutlookAddin/Properties/AssemblyInfo.cs b/src/OutlookAddin/Properties/AssemblyInfo.cs
index 6745bd3..8e5f9ad 100644
--- a/src/OutlookAddin/Properties/AssemblyInfo.cs
+++ b/src/OutlookAddin/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@ using System.Security;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.16.0")]
-[assembly: AssemblyFileVersion("1.2.16.0")]
+[assembly: AssemblyVersion("1.2.17.0")]
+[assembly: AssemblyFileVersion("1.2.17.0")]
 
diff --git a/src/OutlookAddin/Services/AddInHost.cs b/src/OutlookAddin/Services/AddInHost.cs
index b63e725..2ecc49c 100644
--- a/src/OutlookAddin/Services/AddInHost.cs
+++ b/src/OutlookAddin/Services/AddInHost.cs
@@ -367,7 +367,6 @@ namespace OutlookAddin.Services
                 _sidebarController = new SidebarController(
                     taskPanes,
                     _outlookApp,
-                    MatchingService!,
                     this,
                     System.Windows.Threading.Dispatcher.CurrentDispatcher,
                     Logger);
diff --git a/src/OutlookAddin/Services/SidebarController.cs b/src/OutlookAddin/Services/SidebarController.cs
index 8602a5d..73fe68d 100644
--- a/src/OutlookAddin/Services/SidebarController.cs
+++ b/src/OutlookAddin/Services/SidebarController.cs
@@ -27,7 +27,6 @@ namespace OutlookAddin.Services
 
         private readonly CustomTaskPaneCollection _taskPanes;
         private readonly Outlook.Application _app;
-        private readonly IMatchingService _matchingService;
         private readonly AddInHost _host;
         private readonly Dispatcher _dispatcher;
         private readonly ILogger _logger;
@@ -38,14 +37,12 @@ namespace OutlookAddin.Services
         public SidebarController(
             CustomTaskPaneCollection taskPanes,
             Outlook.Application app,
-            IMatchingService matchingService,
             AddInHost host,
             Dispatcher dispatcher,
             ILogger logger)
         {
             _taskPanes = taskPanes ?? throw new ArgumentNullException(nameof(taskPanes));
             _app = app ?? throw new ArgumentNullException(nameof(app));
-            _matchingService = matchingService ?? throw new ArgumentNullException(nameof(matchingService));
             _host = host ?? throw new ArgumentNullException(nameof(host));
             _dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -83,7 +80,7 @@ namespace OutlookAddin.Services
             if (_bindings.ContainsKey(key)) return;
 
             var view = new ReadingPaneView();
-            var vm = new ReadingPaneViewModel(_matchingService, _logger)
+            var vm = new ReadingPaneViewModel(() => _host.MatchingService, _logger)
             {
                 EspoCrmBaseUrl = _host.Settings.EspoCrmUrl
             };