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

properly parse phone numbers at Version 3 vcf files too

Browse Source
This commit is contained in:
tibbi
2018-01-15 00:06:53 +01:00
parent e0257c742d
commit 69b68de511
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt
View File

@ -38,6 +38,8 @@ val CELL = "CELL"
val WORK = "WORK" val WORK = "WORK"
val HOME = "HOME" val HOME = "HOME"
val PREF = "PREF" val PREF = "PREF"
val MAIN = "MAIN"
val FAX = "FAX"
val WORK_FAX = "WORK;FAX" val WORK_FAX = "WORK;FAX"
val HOME_FAX = "HOME;FAX" val HOME_FAX = "HOME;FAX"
val PAGER = "PAGER" val PAGER = "PAGER"

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

@ -73,25 +73,40 @@ class VcfImporter(val activity: SimpleActivity) {
private fun addPhoneNumber(phoneNumber: String) { private fun addPhoneNumber(phoneNumber: String) {
val phoneParts = phoneNumber.trimStart(';').split(":") val phoneParts = phoneNumber.trimStart(';').split(":")
val type = getPhoneNumberTypeId(phoneParts[0]) var rawType = phoneParts[0]
var subType = ""
if (rawType.contains('=')) {
val types = rawType.split('=')
if (types.any { it.contains(';') }) {
subType = types[1].split(';').first()
}
rawType = types.last()
}
val type = getPhoneNumberTypeId(rawType, subType)
val value = phoneParts[1] val value = phoneParts[1]
curPhoneNumbers.add(PhoneNumber(value, type)) curPhoneNumbers.add(PhoneNumber(value, type))
} }
private fun getPhoneNumberTypeId(type: String) = when (type) { private fun getPhoneNumberTypeId(type: String, subType: String) = when (type) {
CELL -> CommonDataKinds.Phone.TYPE_MOBILE CELL -> CommonDataKinds.Phone.TYPE_MOBILE
WORK -> CommonDataKinds.Phone.TYPE_WORK WORK -> CommonDataKinds.Phone.TYPE_WORK
HOME -> CommonDataKinds.Phone.TYPE_HOME HOME -> CommonDataKinds.Phone.TYPE_HOME
PREF -> CommonDataKinds.Phone.TYPE_MAIN PREF, MAIN -> CommonDataKinds.Phone.TYPE_MAIN
WORK_FAX -> CommonDataKinds.Phone.TYPE_FAX_WORK WORK_FAX -> CommonDataKinds.Phone.TYPE_FAX_WORK
HOME_FAX -> CommonDataKinds.Phone.TYPE_FAX_HOME HOME_FAX -> CommonDataKinds.Phone.TYPE_FAX_HOME
FAX -> if (subType == WORK) CommonDataKinds.Phone.TYPE_FAX_WORK else CommonDataKinds.Phone.TYPE_FAX_HOME
PAGER -> CommonDataKinds.Phone.TYPE_PAGER PAGER -> CommonDataKinds.Phone.TYPE_PAGER
else -> CommonDataKinds.Phone.TYPE_OTHER else -> CommonDataKinds.Phone.TYPE_OTHER
} }
private fun addEmail(email: String) { private fun addEmail(email: String) {
val emailParts = email.trimStart(';').split(":") val emailParts = email.trimStart(';').split(":")
val type = getEmailTypeId(emailParts[0]) var rawType = emailParts[0]
if (rawType.contains('=')) {
rawType = rawType.split('=').last()
}
val type = getEmailTypeId(rawType)
val value = emailParts[1] val value = emailParts[1]
curEmails.add(Email(value, type)) curEmails.add(Email(value, type))
} }