diff --git a/Session/Utilities/ContactUtilities.swift b/Session/Utilities/ContactUtilities.swift index 2ca6ad644..61c7550b0 100644 --- a/Session/Utilities/ContactUtilities.swift +++ b/Session/Utilities/ContactUtilities.swift @@ -2,6 +2,7 @@ enum ContactUtilities { static func getAllContacts() -> [String] { + // Collect all contacts var result: [String] = [] Storage.read { transaction in TSContactThread.enumerateCollectionObjects(with: transaction) { object, _ in @@ -12,9 +13,11 @@ enum ContactUtilities { func getDisplayName(for publicKey: String) -> String { return Storage.shared.getContact(with: publicKey)?.displayName(for: .regular) ?? publicKey } + // Remove the current user if let index = result.firstIndex(of: getUserHexEncodedPublicKey()) { result.remove(at: index) } + // Sort alphabetically return result.sorted { getDisplayName(for: $0) < getDisplayName(for: $1) } } }