Dispose view models correctly

justcoding121 · justcoding121 · commit 8a7333b71cb1 · 2025-11-14T18:56:06.000-06:00
diff --git a/src/Bible.Alarm/ViewModels/Bible/BibleSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Bible/BibleSelectionViewModel.cs
@@ -14,13 +14,14 @@
 
 namespace Bible.Alarm.ViewModels.Bible;
 
-public class BibleSelectionViewModel : ObservableObject, IListViewModel
+public class BibleSelectionViewModel : ObservableObject, IListViewModel, IDisposable
 {
     private readonly MediaService _mediaService;
     private readonly IState<ApplicationState> _state;
 
     private BibleReadingSchedule _current;
     private BibleReadingSchedule _tentative;
+    private bool _initComplete;
 
     public ICommand BackCommand { get; set; }
     public ICommand BookSelectionCommand { get; set; }
@@ -92,16 +93,17 @@ public BibleSelectionViewModel(MediaService mediaService, IServiceScopeFactory s
 
         void OnBibleReadingInitialized(object o, EventArgs eventArgs)
         {
+            if (_initComplete) return;
             var stateValue = _state.Value;
             if (stateValue.CurrentBibleReadingSchedule == null || stateValue.TentativeBibleReadingSchedule == null) return;
             _current = stateValue.CurrentBibleReadingSchedule;
             _tentative = stateValue.TentativeBibleReadingSchedule;
+            _initComplete = true;
             Task.Run(async () =>
             {
                 await Initialize(_tentative.LanguageCode);
                 await MainThread.InvokeOnMainThreadAsync(() => IsBusy = false);
             });
-            _state.StateChanged -= OnBibleReadingInitialized;
         }
 
         void OnBibleReadingChanged(object sender, EventArgs e)
@@ -244,4 +246,10 @@ private async Task PopulateTranslations(string languageCode)
 
         Translations = translationVMs;
     }
+
+    public void Dispose()
+    {
+        _state.StateChanged -= OnBibleReadingInitialized;
+        _state.StateChanged -= OnBibleReadingChanged;
+    }
 }
diff --git a/src/Bible.Alarm/ViewModels/Bible/BookSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Bible/BookSelectionViewModel.cs
@@ -21,8 +21,7 @@ public class BookSelectionViewModel : ObservableObject, IDisposable
 
     private readonly MediaService _mediaService;
     private readonly IState<ApplicationState> _state;
-    private EventHandler _onBibleReadingChanged;
-    private EventHandler _onBibleReadingInitialized;
+    private bool _initComplete;
 
     public ICommand BackCommand { get; set; }
     public ICommand ChapterSelectionCommand { get; set; }
@@ -77,34 +76,25 @@ void OnBibleReadingChanged(object sender, EventArgs e)
 
         void OnBibleReadingInitialized(object o, EventArgs eventArgs)
         {
+            if (_initComplete) return;
             var stateValue = _state.Value;
             if (stateValue.CurrentBibleReadingSchedule == null || stateValue.TentativeBibleReadingSchedule == null) return;
             _current = stateValue.CurrentBibleReadingSchedule;
             _tentative = stateValue.TentativeBibleReadingSchedule;
+            _initComplete = true;
             Task.Run(async () =>
             {
                 await MainThread.InvokeOnMainThreadAsync(() => IsBusy = true);
                 await Initialize(_tentative.LanguageCode, _tentative.PublicationCode);
                 await MainThread.InvokeOnMainThreadAsync(() => IsBusy = false);
             });
-
-            if (_onBibleReadingInitialized == null) return;
-            _state.StateChanged -= _onBibleReadingInitialized;
-            _onBibleReadingInitialized = null;
         }
     }
 
     public void Dispose()
     {
-        if (_onBibleReadingChanged != null)
-        {
-            _state.StateChanged -= _onBibleReadingChanged;
-            _onBibleReadingChanged = null;
-        }
-
-        if (_onBibleReadingInitialized == null) return;
-        _state.StateChanged -= _onBibleReadingInitialized;
-        _onBibleReadingInitialized = null;
+        _state.StateChanged -= OnBibleReadingChanged;
+        _state.StateChanged -= OnBibleReadingInitialized;
     }
 
     private void SetSelectedBook()
diff --git a/src/Bible.Alarm/ViewModels/Bible/ChapterSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Bible/ChapterSelectionViewModel.cs
@@ -29,6 +29,7 @@ public class ChapterSelectionViewModel : ObservableObject, IDisposable
     private readonly IMediaCacheService _cacheService;
     private readonly IDownloadService _downloadService;
     private readonly IState<ApplicationState> _state;
+    private bool _initComplete;
 
     private readonly Dictionary<BibleChapterListViewItemModel, PropertyChangedEventHandler> _propertyChangedHandlers = [];
 
@@ -86,16 +87,17 @@ public ChapterSelectionViewModel(
 
         void OnBibleReadingInitialized(object o, EventArgs eventArgs)
         {
+            if (_initComplete) return;
             var stateValue = _state.Value;
             if (stateValue.CurrentBibleReadingSchedule == null || stateValue.TentativeBibleReadingSchedule == null) return;
             _current = stateValue.CurrentBibleReadingSchedule;
             _tentative = stateValue.TentativeBibleReadingSchedule;
+            _initComplete = true;
             Task.Run(async () =>
             {
                 await Initialize(_tentative.LanguageCode, _tentative.PublicationCode, _tentative.BookNumber);
                 await MainThread.InvokeOnMainThreadAsync(() => IsBusy = false);
             });
-            _state.StateChanged -= OnBibleReadingInitialized;
         }
     }
 
@@ -323,11 +325,15 @@ await MainThread.InvokeOnMainThreadAsync(() =>
 
     public void Dispose()
     {
+        _state.StateChanged -= OnBibleReadingInitialized;
         _playService.OnStopped -= OnPlayServiceStopped;
         
-        foreach (var chapter in Chapters)
+        if (Chapters != null)
         {
-            UnsubscribeFromChapterEvents(chapter);
+            foreach (var chapter in Chapters)
+            {
+                UnsubscribeFromChapterEvents(chapter);
+            }
         }
         
         _propertyChangedHandlers.Clear();
diff --git a/src/Bible.Alarm/ViewModels/Music/MusicSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Music/MusicSelectionViewModel.cs
@@ -13,7 +13,7 @@
 
 namespace Bible.Alarm.ViewModels.Music;
 
-public class MusicSelectionViewModel : ObservableObject
+public class MusicSelectionViewModel : ObservableObject, IDisposable
 {
     private AlarmMusic _current;
 
@@ -123,6 +123,11 @@ public MusicTypeListItemViewModel SelectedMusicType
         get => _selectedMusicType;
         set => SetProperty(ref _selectedMusicType, value);
     }
+
+    public void Dispose()
+    {
+        _state.StateChanged -= OnStateOnStateChanged;
+    }
 }
 
 public class MusicTypeListItemViewModel : ObservableObject, IComparable
diff --git a/src/Bible.Alarm/ViewModels/Music/SongBookSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Music/SongBookSelectionViewModel.cs
@@ -15,13 +15,14 @@
 
 namespace Bible.Alarm.ViewModels.Music;
 
-public class SongBookSelectionViewModel : ObservableObject, IListViewModel
+public class SongBookSelectionViewModel : ObservableObject, IListViewModel, IDisposable
 {
     private readonly MediaService _mediaService;
     private readonly IState<ApplicationState> _state;
 
     private AlarmMusic _current;
     private AlarmMusic _tentative;
+    private bool _initComplete;
 
     public SongBookSelectionViewModel(MediaService mediaService, IServiceScopeFactory scopeFactory, INavigationService navigationService)
     {
@@ -50,16 +51,17 @@ void OnMusicChanged(object sender, EventArgs e)
 
         void OnMusicInitialized(object o, EventArgs eventArgs)
         {
+            if (_initComplete) return;
             var stateValue = _state.Value;
             if (stateValue.CurrentMusic == null || stateValue.TentativeMusic == null) return;
             _current = stateValue.CurrentMusic;
             _tentative = stateValue.TentativeMusic;
+            _initComplete = true;
             Task.Run(async () =>
             {
                 await Initialize();
                 await MainThread.InvokeOnMainThreadAsync(() => IsBusy = false);
             });
-            _state.StateChanged -= OnMusicInitialized;
         }
 
         _state.StateChanged += OnMusicInitialized;
@@ -261,4 +263,10 @@ private async Task PopulateSongBooks(string languageCode)
 
         SongBooks = songBookVMs;
     }
+
+    public void Dispose()
+    {
+        _state.StateChanged -= OnMusicInitialized;
+        _state.StateChanged -= OnMusicChanged;
+    }
 }
diff --git a/src/Bible.Alarm/ViewModels/Music/TrackSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Music/TrackSelectionViewModel.cs
@@ -33,6 +33,7 @@ public class TrackSelectionViewModel : ObservableObject, IDisposable
     private AlarmMusic _current;
     private AlarmMusic _tentative;
     private bool _initialized;
+    private bool _initComplete;
 
     private readonly Dictionary<MusicTrackListViewItemModel, PropertyChangedEventHandler> _propertyChangedHandlers = [];
 
@@ -103,6 +104,7 @@ public TrackSelectionViewModel(
 
         void OnMusicInitialized(object o, EventArgs eventArgs)
         {
+            if (_initComplete) return;
             if (_initialized) return;
             var stateValue = _state.Value;
             // For track selection, we only need TentativeMusic to initialize
@@ -112,13 +114,13 @@ void OnMusicInitialized(object o, EventArgs eventArgs)
             // Use TentativeMusic as CurrentMusic if CurrentMusic is null
             _current = stateValue.CurrentMusic ?? stateValue.TentativeMusic;
             _initialized = true;
+            _initComplete = true;
             Task.Run(async () =>
             {
                 await MainThread.InvokeOnMainThreadAsync(() => IsBusy = true);
                 await Initialize(_tentative.LanguageCode, _tentative.PublicationCode);
                 await MainThread.InvokeOnMainThreadAsync(() => IsBusy = false);
             });
-            _state.StateChanged -= OnMusicInitialized;
         }
     }
 
@@ -372,11 +374,15 @@ await MainThread.InvokeOnMainThreadAsync(() =>
 
     public void Dispose()
     {
+        _state.StateChanged -= OnMusicInitialized;
         _playService.OnStopped -= OnPlayServiceStopped;
         
-        foreach (var track in Tracks)
+        if (Tracks != null)
         {
-            UnsubscribeFromTrackEvents(track);
+            foreach (var track in Tracks)
+            {
+                UnsubscribeFromTrackEvents(track);
+            }
         }
 
         _propertyChangedHandlers.Clear();
diff --git a/src/Bible.Alarm/ViewModels/ScheduleViewModel.cs b/src/Bible.Alarm/ViewModels/ScheduleViewModel.cs
@@ -21,7 +21,7 @@
 
 namespace Bible.Alarm.ViewModels;
 
-public class ScheduleViewModel : ObservableObject
+public class ScheduleViewModel : ObservableObject, IDisposable
 {
     private readonly ILogger _logger;
 
@@ -678,4 +678,11 @@ await MainThread.InvokeOnMainThreadAsync(() =>
             }
         });
     }
+
+    public void Dispose()
+    {
+        _state.StateChanged -= OnCurrentScheduleChanged;
+        _state.StateChanged -= OnMusicChanged;
+        _state.StateChanged -= OnBibleReadingChanged;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public class ChapterSelectionViewModel : ObservableObject, IDisposable`
`29`	`29`	`private readonly IMediaCacheService _cacheService;`
`30`	`30`	`private readonly IDownloadService _downloadService;`
`31`	`31`	`private readonly IState<ApplicationState> _state;`
	`32`	`+ private bool _initComplete;`
`32`	`33`
`33`	`34`	`private readonly Dictionary<BibleChapterListViewItemModel, PropertyChangedEventHandler> _propertyChangedHandlers = [];`
`34`	`35`
`@@ -86,16 +87,17 @@ public ChapterSelectionViewModel(`
`86`	`87`
`87`	`88`	`void OnBibleReadingInitialized(object o, EventArgs eventArgs)`
`88`	`89`	`{`
	`90`	`+ if (_initComplete) return;`
`89`	`91`	`var stateValue = _state.Value;`
`90`	`92`	`if (stateValue.CurrentBibleReadingSchedule == null \|\| stateValue.TentativeBibleReadingSchedule == null) return;`
`91`	`93`	`_current = stateValue.CurrentBibleReadingSchedule;`
`92`	`94`	`_tentative = stateValue.TentativeBibleReadingSchedule;`
	`95`	`+ _initComplete = true;`
`93`	`96`	`Task.Run(async () =>`
`94`	`97`	`{`
`95`	`98`	`await Initialize(_tentative.LanguageCode, _tentative.PublicationCode, _tentative.BookNumber);`
`96`	`99`	`await MainThread.InvokeOnMainThreadAsync(() => IsBusy = false);`
`97`	`100`	`});`
`98`		`- _state.StateChanged -= OnBibleReadingInitialized;`
`99`	`101`	`}`
`100`	`102`	`}`
`101`	`103`
`@@ -323,11 +325,15 @@ await MainThread.InvokeOnMainThreadAsync(() =>`
`323`	`325`
`324`	`326`	`public void Dispose()`
`325`	`327`	`{`
	`328`	`+ _state.StateChanged -= OnBibleReadingInitialized;`
`326`	`329`	`_playService.OnStopped -= OnPlayServiceStopped;`
`327`	`330`
`328`		`- foreach (var chapter in Chapters)`
	`331`	`+ if (Chapters != null)`
`329`	`332`	`{`
`330`		`- UnsubscribeFromChapterEvents(chapter);`
	`333`	`+ foreach (var chapter in Chapters)`
	`334`	`+ {`
	`335`	`+ UnsubscribeFromChapterEvents(chapter);`
	`336`	`+ }`
`331`	`337`	`}`
`332`	`338`
`333`	`339`	`_propertyChangedHandlers.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`namespace Bible.Alarm.ViewModels.Music;`
`15`	`15`
`16`		`-public class MusicSelectionViewModel : ObservableObject`
	`16`	`+public class MusicSelectionViewModel : ObservableObject, IDisposable`
`17`	`17`	`{`
`18`	`18`	`private AlarmMusic _current;`
`19`	`19`
`@@ -123,6 +123,11 @@ public MusicTypeListItemViewModel SelectedMusicType`
`123`	`123`	`get => _selectedMusicType;`
`124`	`124`	`set => SetProperty(ref _selectedMusicType, value);`
`125`	`125`	`}`
	`126`	`+`
	`127`	`+ public void Dispose()`
	`128`	`+ {`
	`129`	`+ _state.StateChanged -= OnStateOnStateChanged;`
	`130`	`+ }`
`126`	`131`	`}`
`127`	`132`
`128`	`133`	`public class MusicTypeListItemViewModel : ObservableObject, IComparable`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,14 @@`
`15`	`15`
`16`	`16`	`namespace Bible.Alarm.ViewModels.Music;`
`17`	`17`
`18`		`-public class SongBookSelectionViewModel : ObservableObject, IListViewModel`
	`18`	`+public class SongBookSelectionViewModel : ObservableObject, IListViewModel, IDisposable`
`19`	`19`	`{`
`20`	`20`	`private readonly MediaService _mediaService;`
`21`	`21`	`private readonly IState<ApplicationState> _state;`
`22`	`22`
`23`	`23`	`private AlarmMusic _current;`
`24`	`24`	`private AlarmMusic _tentative;`
	`25`	`+ private bool _initComplete;`
`25`	`26`
`26`	`27`	`public SongBookSelectionViewModel(MediaService mediaService, IServiceScopeFactory scopeFactory, INavigationService navigationService)`
`27`	`28`	`{`
`@@ -50,16 +51,17 @@ void OnMusicChanged(object sender, EventArgs e)`
`50`	`51`
`51`	`52`	`void OnMusicInitialized(object o, EventArgs eventArgs)`
`52`	`53`	`{`
	`54`	`+ if (_initComplete) return;`
`53`	`55`	`var stateValue = _state.Value;`
`54`	`56`	`if (stateValue.CurrentMusic == null \|\| stateValue.TentativeMusic == null) return;`
`55`	`57`	`_current = stateValue.CurrentMusic;`
`56`	`58`	`_tentative = stateValue.TentativeMusic;`
	`59`	`+ _initComplete = true;`
`57`	`60`	`Task.Run(async () =>`
`58`	`61`	`{`
`59`	`62`	`await Initialize();`
`60`	`63`	`await MainThread.InvokeOnMainThreadAsync(() => IsBusy = false);`
`61`	`64`	`});`
`62`		`- _state.StateChanged -= OnMusicInitialized;`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`_state.StateChanged += OnMusicInitialized;`
`@@ -261,4 +263,10 @@ private async Task PopulateSongBooks(string languageCode)`
`261`	`263`
`262`	`264`	`SongBooks = songBookVMs;`
`263`	`265`	`}`
	`266`	`+`
	`267`	`+ public void Dispose()`
	`268`	`+ {`
	`269`	`+ _state.StateChanged -= OnMusicInitialized;`
	`270`	`+ _state.StateChanged -= OnMusicChanged;`
	`271`	`+ }`
`264`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public class TrackSelectionViewModel : ObservableObject, IDisposable`
`33`	`33`	`private AlarmMusic _current;`
`34`	`34`	`private AlarmMusic _tentative;`
`35`	`35`	`private bool _initialized;`
	`36`	`+ private bool _initComplete;`
`36`	`37`
`37`	`38`	`private readonly Dictionary<MusicTrackListViewItemModel, PropertyChangedEventHandler> _propertyChangedHandlers = [];`
`38`	`39`
`@@ -103,6 +104,7 @@ public TrackSelectionViewModel(`
`103`	`104`
`104`	`105`	`void OnMusicInitialized(object o, EventArgs eventArgs)`
`105`	`106`	`{`
	`107`	`+ if (_initComplete) return;`
`106`	`108`	`if (_initialized) return;`
`107`	`109`	`var stateValue = _state.Value;`
`108`	`110`	`// For track selection, we only need TentativeMusic to initialize`
`@@ -112,13 +114,13 @@ void OnMusicInitialized(object o, EventArgs eventArgs)`
`112`	`114`	`// Use TentativeMusic as CurrentMusic if CurrentMusic is null`
`113`	`115`	`_current = stateValue.CurrentMusic ?? stateValue.TentativeMusic;`
`114`	`116`	`_initialized = true;`
	`117`	`+ _initComplete = true;`
`115`	`118`	`Task.Run(async () =>`
`116`	`119`	`{`
`117`	`120`	`await MainThread.InvokeOnMainThreadAsync(() => IsBusy = true);`
`118`	`121`	`await Initialize(_tentative.LanguageCode, _tentative.PublicationCode);`
`119`	`122`	`await MainThread.InvokeOnMainThreadAsync(() => IsBusy = false);`
`120`	`123`	`});`
`121`		`- _state.StateChanged -= OnMusicInitialized;`
`122`	`124`	`}`
`123`	`125`	`}`
`124`	`126`
`@@ -372,11 +374,15 @@ await MainThread.InvokeOnMainThreadAsync(() =>`
`372`	`374`
`373`	`375`	`public void Dispose()`
`374`	`376`	`{`
	`377`	`+ _state.StateChanged -= OnMusicInitialized;`
`375`	`378`	`_playService.OnStopped -= OnPlayServiceStopped;`
`376`	`379`
`377`		`- foreach (var track in Tracks)`
	`380`	`+ if (Tracks != null)`
`378`	`381`	`{`
`379`		`- UnsubscribeFromTrackEvents(track);`
	`382`	`+ foreach (var track in Tracks)`
	`383`	`+ {`
	`384`	`+ UnsubscribeFromTrackEvents(track);`
	`385`	`+ }`
`380`	`386`	`}`
`381`	`387`
`382`	`388`	`_propertyChangedHandlers.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`namespace Bible.Alarm.ViewModels;`
`23`	`23`
`24`		`-public class ScheduleViewModel : ObservableObject`
	`24`	`+public class ScheduleViewModel : ObservableObject, IDisposable`
`25`	`25`	`{`
`26`	`26`	`private readonly ILogger _logger;`
`27`	`27`
`@@ -678,4 +678,11 @@ await MainThread.InvokeOnMainThreadAsync(() =>`
`678`	`678`	`}`
`679`	`679`	`});`
`680`	`680`	`}`
	`681`	`+`
	`682`	`+ public void Dispose()`
	`683`	`+ {`
	`684`	`+ _state.StateChanged -= OnCurrentScheduleChanged;`
	`685`	`+ _state.StateChanged -= OnMusicChanged;`
	`686`	`+ _state.StateChanged -= OnBibleReadingChanged;`
	`687`	`+ }`
`681`	`688`	`}`