further fix for global search sorting

pull/891/head
Ryan ZHAO 10 months ago
parent 7bd6aae7e2
commit d6b8616543

@ -42,6 +42,7 @@ class GlobalSearchViewController: BaseVC, LibSessionRespondingViewController, UI
// MARK: - Variables
private lazy var defaultSearchResults: SearchResultData = {
let nonalphabeticNameTitle: String = "#"
let contacts: [SessionThreadViewModel] = Storage.shared.read { db -> [SessionThreadViewModel]? in
try SessionThreadViewModel
.defaultContactsQuery(userPublicKey: getUserHexEncodedPublicKey(db))
@ -69,7 +70,7 @@ class GlobalSearchViewController: BaseVC, LibSessionRespondingViewController, UI
let initialCharacter: String = (displayName.length > 0 ? displayName.substring(to: 1) : "")
let section: String = initialCharacter.capitalized.isSingleAlphabet ?
initialCharacter.capitalized :
"#"
nonalphabeticNameTitle
if groupedContacts[section] == nil {
groupedContacts[section] = SectionModel(
@ -96,11 +97,11 @@ class GlobalSearchViewController: BaseVC, LibSessionRespondingViewController, UI
}
}()
if title0.isAlphabetic && title1.isAlphabetic {
if ![title0, title1].contains(nonalphabeticNameTitle) {
return title0 < title1
}
return title1 == "#"
return title1 == nonalphabeticNameTitle
}
)
}()

Loading…
Cancel
Save