wbrawner/Simple-Contacts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #769, import whole address from .vcf files

Browse source
This commit is contained in:
tibbi 2022-02-07 12:25:48 +01:00
parent 7d6c21c102
commit 9f0e736ec3
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt
View file

@ -83,7 +83,7 @@ class VcfImporter(val activity: SimpleActivity) {
val addresses = ArrayList<Address>()
ezContact.addresses.forEach {
val address = it.streetAddress
var address = it.streetAddress ?: ""
val type = getAddressTypeId(it.types.firstOrNull()?.value ?: HOME)
val label = if (type == StructuredPostal.TYPE_CUSTOM) {
it.types.firstOrNull()?.value ?: ""
@ -91,7 +91,28 @@ class VcfImporter(val activity: SimpleActivity) {
""
}
if (address?.isNotEmpty() == true) {
if (it.locality?.isNotEmpty() == true) {
address += " ${it.locality} "
}
if (it.region?.isNotEmpty() == true) {
if (address.isNotEmpty()) {
address = "${address.trim()}, "
}
address += "${it.region} "
}
if (it.postalCode?.isNotEmpty() == true) {
address += "${it.postalCode} "
}
if (it.country?.isNotEmpty() == true) {
address += "${it.country} "
}
address = address.trim()
if (address.isNotEmpty()) {
addresses.add(Address(address, type, label))
}
}