From 808d85eca0d94d159d5cc63b5905486282e1a199 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Wed, 5 Jul 2023 23:10:10 +0200
Subject: [PATCH] minor fix

---
 lib/model/source/album.dart           | 4 +++-
 lib/model/source/collection_lens.dart | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/model/source/album.dart b/lib/model/source/album.dart
index 1a2c09bd4..2e6057334 100644
--- a/lib/model/source/album.dart
+++ b/lib/model/source/album.dart
@@ -19,7 +19,9 @@ mixin AlbumMixin on SourceBase {
 
   Set<AlbumFilter> getNewAlbumFilters(BuildContext context) => Set.unmodifiable(_newAlbums.map((v) => AlbumFilter(v, getAlbumDisplayName(context, v))));
 
-  int compareAlbumsByName(String a, String b) {
+  int compareAlbumsByName(String? a, String? b) {
+    a ??= '';
+    b ??= '';
     final ua = getAlbumDisplayName(null, a);
     final ub = getAlbumDisplayName(null, b);
     final c = compareAsciiUpperCaseNatural(ua, ub);
diff --git a/lib/model/source/collection_lens.dart b/lib/model/source/collection_lens.dart
index b6d66733e..23af9b736 100644
--- a/lib/model/source/collection_lens.dart
+++ b/lib/model/source/collection_lens.dart
@@ -245,7 +245,7 @@ class CollectionLens with ChangeNotifier {
           }
         case EntrySortFactor.name:
           final byAlbum = groupBy<AvesEntry, EntryAlbumSectionKey>(_filteredSortedEntries, (entry) => EntryAlbumSectionKey(entry.directory));
-          final compare = sortReverse ? (a, b) => source.compareAlbumsByName(b.directory!, a.directory!) : (a, b) => source.compareAlbumsByName(a.directory!, b.directory!);
+          final int Function(EntryAlbumSectionKey, EntryAlbumSectionKey) compare = sortReverse ? (a, b) => source.compareAlbumsByName(b.directory, a.directory) : (a, b) => source.compareAlbumsByName(a.directory, b.directory);
           sections = SplayTreeMap<EntryAlbumSectionKey, List<AvesEntry>>.of(byAlbum, compare);
         case EntrySortFactor.rating:
           sections = groupBy<AvesEntry, EntryRatingSectionKey>(_filteredSortedEntries, (entry) => EntryRatingSectionKey(entry.rating));