fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #4, properly import contacts exported from Thunderbird

Browse Source
This commit is contained in:
tibbi
2018-01-23 21:04:13 +01:00
parent d59f2277ab
commit 83418936f5
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfImporter.kt
View File

@ -57,14 +57,14 @@ class VcfImporter(val activity: SimpleActivity) {
} }
when { when {
line == BEGIN_VCARD -> resetValues() line.toUpperCase() == BEGIN_VCARD -> resetValues()
line.startsWith(N) -> parseNames(line.substring(N.length)) line.toUpperCase().startsWith(N) -> parseNames(line.substring(N.length))
line.startsWith(TEL) -> addPhoneNumber(line.substring(TEL.length)) line.toUpperCase().startsWith(TEL) -> addPhoneNumber(line.substring(TEL.length))
line.startsWith(EMAIL) -> addEmail(line.substring(EMAIL.length)) line.toUpperCase().startsWith(EMAIL) -> addEmail(line.substring(EMAIL.length))
line.startsWith(BDAY) -> addBirthday(line.substring(BDAY.length)) line.toUpperCase().startsWith(BDAY) -> addBirthday(line.substring(BDAY.length))
line.startsWith(ANNIVERSARY) -> addAnniversary(line.substring(ANNIVERSARY.length)) line.toUpperCase().startsWith(ANNIVERSARY) -> addAnniversary(line.substring(ANNIVERSARY.length))
line.startsWith(PHOTO) -> addPhoto(line.substring(PHOTO.length)) line.toUpperCase().startsWith(PHOTO) -> addPhoto(line.substring(PHOTO.length))
line == END_VCARD -> saveContact(targetContactSource) line.toUpperCase() == END_VCARD -> saveContact(targetContactSource)
isGettingPhoto -> currentPhotoString.append(line.trim()) isGettingPhoto -> currentPhotoString.append(line.trim())
} }
} }
@ -83,9 +83,11 @@ class VcfImporter(val activity: SimpleActivity) {
private fun parseNames(names: String) { private fun parseNames(names: String) {
val nameParts = names.split(";") val nameParts = names.split(";")
curFirstName = nameParts[1]
curMiddleName = nameParts[2]
curSurname = nameParts[0] curSurname = nameParts[0]
curFirstName = nameParts[1]
if (nameParts.size > 2) {
curMiddleName = nameParts[2]
}
} }
private fun addPhoneNumber(phoneNumber: String) { private fun addPhoneNumber(phoneNumber: String) {
@ -100,7 +102,7 @@ class VcfImporter(val activity: SimpleActivity) {
rawType = types.last() rawType = types.last()
} }
val type = getPhoneNumberTypeId(rawType, subType) val type = getPhoneNumberTypeId(rawType.toUpperCase(), subType)
val value = phoneParts[1] val value = phoneParts[1]
curPhoneNumbers.add(PhoneNumber(value, type)) curPhoneNumbers.add(PhoneNumber(value, type))
} }
@ -123,7 +125,7 @@ class VcfImporter(val activity: SimpleActivity) {
if (rawType.contains('=')) { if (rawType.contains('=')) {
rawType = rawType.split('=').last() rawType = rawType.split('=').last()
} }
val type = getEmailTypeId(rawType) val type = getEmailTypeId(rawType.toUpperCase())
val value = emailParts[1] val value = emailParts[1]
curEmails.add(Email(value, type)) curEmails.add(Email(value, type))
} }