Skip to content

fix: trim vCard name fields on import to fix mis-sorting #574

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
MiMoHo wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −6
Open

fix: trim vCard name fields on import to fix mis-sorting #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Fixed
- Fixed contacts imported from vCard files being mis-sorted (filed after "Z") when their name fields contained leading or trailing whitespace ([#195])

## [1.6.0] - 2026-01-30
### Added
Expand Down Expand Up @@ -119,6 +121,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#30]: https://github.com/FossifyOrg/Contacts/issues/30
[#78]: https://github.com/FossifyOrg/Contacts/issues/78
[#157]: https://github.com/FossifyOrg/Contacts/issues/157
[#195]: https://github.com/FossifyOrg/Contacts/issues/195
[#201]: https://github.com/FossifyOrg/Contacts/issues/201
[#281]: https://github.com/FossifyOrg/Contacts/issues/281
[#289]: https://github.com/FossifyOrg/Contacts/issues/289
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/kotlin/org/fossify/contacts/helpers/VcfImporter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ class VcfImporter(val activity: SimpleActivity) {
val ezContacts = Ezvcard.parse(inputStream).all()
for (ezContact in ezContacts) {
val structuredName = ezContact.structuredName
val prefix = structuredName?.prefixes?.firstOrNull() ?: ""
val firstName = structuredName?.given ?: ""
val middleName = structuredName?.additionalNames?.firstOrNull() ?: ""
val surname = structuredName?.family ?: ""
val suffix = structuredName?.suffixes?.firstOrNull() ?: ""
val nickname = ezContact.nickname?.values?.firstOrNull() ?: ""
val prefix = structuredName?.prefixes?.firstOrNull()?.trim() ?: ""
val firstName = structuredName?.given?.trim() ?: ""
val middleName = structuredName?.additionalNames?.firstOrNull()?.trim() ?: ""
val surname = structuredName?.family?.trim() ?: ""
val suffix = structuredName?.suffixes?.firstOrNull()?.trim() ?: ""
val nickname = ezContact.nickname?.values?.firstOrNull()?.trim() ?: ""
var photoUri = ""

val phoneNumbers = ArrayList<PhoneNumber>()
Expand Down
Loading