From ee9efe7dc0f186fe8ade47130b795a5e89039e51 Mon Sep 17 00:00:00 2001
From: Nora Trapp <nora@signal.org>
Date: Fri, 23 Apr 2021 21:24:32 -0700
Subject: [PATCH] Fix search crash

---
 SignalMessaging/utils/FullTextSearcher.swift | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/SignalMessaging/utils/FullTextSearcher.swift b/SignalMessaging/utils/FullTextSearcher.swift
index 6bec28ce9f..b1cba91ea6 100644
--- a/SignalMessaging/utils/FullTextSearcher.swift
+++ b/SignalMessaging/utils/FullTextSearcher.swift
@@ -152,10 +152,6 @@ public class GroupSearchResult: NSObject, Comparable {
             return nil
         }
 
-        func normalize(string: String) -> String { string.lowercased() }
-
-        let normalizedSearchText = normalize(string: searchText)
-
         let members: [(
             address: SignalServiceAddress,
             displayName: String,
@@ -164,7 +160,7 @@ public class GroupSearchResult: NSObject, Comparable {
         )] = groupThread.groupMembership.fullMembers.map { address in
             var displayName = contactsManager.displayName(for: address, transaction: transaction)
             var isMatched = false
-            if let matchRange = normalize(string: displayName).range(of: normalizedSearchText) {
+            if let matchRange = displayName.range(of: searchText, options: [.caseInsensitive, .diacriticInsensitive]) {
                 isMatched = true
                 displayName = displayName.replacingCharacters(
                     in: matchRange,