Skip to content

Fix: Sort name incase of blank first/middle/sur-name #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jguegel wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix: Sort name incase of blank first/middle/sur-name #322

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42bcea2
add sorting fallbacks
Mar 7, 2026
4a3ca33
adjust sorting for contacts app
Mar 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ data class Contact(
override fun compareTo(other: Contact): Int {
var result = when {
sorting and SORT_BY_FIRST_NAME != 0 -> {
val firstString = firstName.normalizeString()
val secondString = other.firstName.normalizeString()
val firstString = firstName.ifEmpty { surname }.normalizeString()
val secondString = other.firstName.ifEmpty { other.surname }.normalizeString()
compareUsingStrings(firstString, secondString, other)
}

sorting and SORT_BY_MIDDLE_NAME != 0 -> {
val firstString = middleName.normalizeString()
val secondString = other.middleName.normalizeString()
val firstString = middleName.ifEmpty { firstName }.normalizeString()
val secondString = other.middleName.ifEmpty { other.firstName }.normalizeString()
compareUsingStrings(firstString, secondString, other)
}

sorting and SORT_BY_SURNAME != 0 -> {
val firstString = surname.normalizeString()
val secondString = other.surname.normalizeString()
val firstString = surname.ifEmpty { firstName }.normalizeString()
val secondString = other.surname.ifEmpty { other.firstName }.normalizeString()
compareUsingStrings(firstString, secondString, other)
}

Expand Down
Loading