From 8e073800cd007a741aae481bb2beb2cb4d24bb68 Mon Sep 17 00:00:00 2001
From: MBucari <mbucari1@gmail.com>
Date: Mon, 10 Nov 2025 18:25:59 -0700
Subject: [PATCH] Fix BookDetailsDialog crash when changing error status

---
 .../Dialogs/BookDetailsDialog.axaml           |  6 ++-
 .../Dialogs/BookDetailsDialog.axaml.cs        | 51 +++++++++----------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
index c7c7ed3f..e7e4a658 100644
--- a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
@@ -7,6 +7,9 @@
 		Width="650" Height="500"
         x:Class="LibationAvalonia.Dialogs.BookDetailsDialog"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+		xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs"
+		x:DataType="dialogs:BookDetailsDialog+BookDetailsDialogViewModel"
+		x:CompileBindings="True"
         Title="Book Details" Name="BookDetails">
 
 	<Grid RowDefinitions="*,Auto,Auto,40">
@@ -27,7 +30,7 @@
 					Margin="10"
 					TextWrapping="Wrap"
 					TextAlignment="Center"
-					Tapped="GoToAudible_Tapped"
+					Command="{Binding OpenInAudibleCommand}"
 					Text="Open in&#xa;Audible&#xa;(Browser)" />
 			</Panel>
 			
@@ -91,6 +94,7 @@
 						MinHeight="25"
 						Height="25"
 						VerticalAlignment="Center"
+						SelectionChanged="BookStatus_SelectionChanged"
 						SelectedItem="{Binding BookLiberatedSelectedItem, Mode=TwoWay}"
 						ItemsSource="{Binding BookLiberatedItems}">
 						
diff --git a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs
index b0dabb41..c0e53fa9 100644
--- a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs
@@ -1,13 +1,16 @@
 using ApplicationServices;
+using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
 using DataLayer;
 using Dinah.Core;
+using LibationAvalonia.Controls;
 using LibationAvalonia.ViewModels;
 using LibationFileManager;
+using ReactiveUI;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
+using System.Windows.Input;
 
 namespace LibationAvalonia.Dialogs
 {
@@ -61,25 +64,26 @@ namespace LibationAvalonia.Dialogs
 			base.SaveAndClose();
 		}
 
-		public void GoToAudible_Tapped(object sender, Avalonia.Input.TappedEventArgs e)
+		public void BookStatus_SelectionChanged(object sender, SelectionChangedEventArgs e)
 		{
-			var locale = AudibleApi.Localization.Get(_libraryBook.Book.Locale);
-			var link = $"https://www.audible.{locale.TopDomain}/pd/{_libraryBook.Book.AudibleProductId}";
-			Go.To.Url(link);
+			if (sender is not WheelComboBox { SelectedItem: liberatedComboBoxItem { Status: LiberatedStatus.Error } } &&
+				_viewModel.BookLiberatedItems.SingleOrDefault(s => s.Status == LiberatedStatus.Error) is liberatedComboBoxItem errorItem)
+			{
+				_viewModel.BookLiberatedItems.Remove(errorItem);
+			}
 		}
 
 		public void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 			=> SaveAndClose();
-
-		private class BookDetailsDialogViewModel : ViewModelBase
+		public class liberatedComboBoxItem
 		{
-			public class liberatedComboBoxItem
-			{
-				public LiberatedStatus Status { get; set; }
-				public string Text { get; set; }
-				public override string ToString() => Text;
-			}
+			public LiberatedStatus Status { get; set; }
+			public string Text { get; set; }
+			public override string ToString() => Text;
+		}
 
+		public class BookDetailsDialogViewModel : ViewModelBase
+		{
 			public Bitmap Cover { get; set; }
 			public string DetailsText { get; set; }
 			public string Tags { get; set; }
@@ -87,27 +91,20 @@ namespace LibationAvalonia.Dialogs
 			public bool HasPDF => PdfLiberatedItems?.Count > 0;
 
 			private liberatedComboBoxItem _bookLiberatedSelectedItem;
-			public ObservableCollection<liberatedComboBoxItem> BookLiberatedItems { get; } = new();
+			public AvaloniaList<liberatedComboBoxItem> BookLiberatedItems { get; } = new();
 			public List<liberatedComboBoxItem> PdfLiberatedItems { get; } = new();
 			public liberatedComboBoxItem PdfLiberatedSelectedItem { get; set; }
-
-			public liberatedComboBoxItem BookLiberatedSelectedItem
-			{
-				get => _bookLiberatedSelectedItem;
-				set
-				{
-					_bookLiberatedSelectedItem = value;
-					if (value?.Status is not LiberatedStatus.Error)
-					{
-						BookLiberatedItems.Remove(BookLiberatedItems.SingleOrDefault(s => s.Status == LiberatedStatus.Error));
-					}
-				}
-			}
+			public liberatedComboBoxItem BookLiberatedSelectedItem { get; set; }
+			public ICommand OpenInAudibleCommand { get; }
 
 			public BookDetailsDialogViewModel(LibraryBook libraryBook)
 			{
 				var Book = libraryBook.Book;
 
+				var locale = AudibleApi.Localization.Get(libraryBook.Book.Locale);
+				var link = $"https://www.audible.{locale.TopDomain}/pd/{libraryBook.Book.AudibleProductId}";
+				OpenInAudibleCommand = ReactiveCommand.Create(() => Go.To.Url(link));
+
 				//init tags
 				Tags = libraryBook.Book.UserDefinedItem.Tags;