From a211d0c994a91569992a306a60933af1cf119bdb Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Thu, 11 Sep 2025 10:52:41 +0200 Subject: [PATCH] Fix sorted list in MagicSearch when friend is nil --- Linphone/Utils/MagicSearchSingleton.swift | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Linphone/Utils/MagicSearchSingleton.swift b/Linphone/Utils/MagicSearchSingleton.swift index 3ec990ea3..281b2e297 100644 --- a/Linphone/Utils/MagicSearchSingleton.swift +++ b/Linphone/Utils/MagicSearchSingleton.swift @@ -94,11 +94,13 @@ final class MagicSearchSingleton: ObservableObject { } } - let sortedLastSearch = lastSearchFriend.sorted(by: { - $0.friend!.name!.lowercased().folding(options: .diacriticInsensitive, locale: .current) - < - $1.friend!.name!.lowercased().folding(options: .diacriticInsensitive, locale: .current) - }) + let sortedLastSearch = lastSearchFriend.sorted { + let name1 = $0.friend?.name?.lowercased() + .folding(options: .diacriticInsensitive, locale: .current) ?? "" + let name2 = $1.friend?.name?.lowercased() + .folding(options: .diacriticInsensitive, locale: .current) ?? "" + return name1 < name2 + } var addedAvatarListModel: [ContactAvatarModel] = [] sortedLastSearch.forEach { searchResult in