From 3ae9bc251169d0112d6d33b999959bc2d8456419 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Sat, 4 Mar 2023 14:24:31 +0100 Subject: [PATCH] Use PREF for the preference rather than the number type Co-authored-by: Pachat2000 --- .../contacts/pro/helpers/VcfExporter.kt | 5 +++++ .../contacts/pro/helpers/VcfImporter.kt | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt index 3be2f5d1..d586a0df 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt @@ -73,6 +73,9 @@ class VcfExporter { contact.phoneNumbers.forEach { val phoneNumber = Telephone(it.value) phoneNumber.parameters.addType(getPhoneNumberTypeLabel(it.type, it.label)) + if (it.isPrimary) { + phoneNumber.parameters.addType(getPreferredType(1)) + } card.addTelephoneNumber(phoneNumber) } @@ -201,4 +204,6 @@ class VcfExporter { StructuredPostal.TYPE_OTHER -> OTHER else -> label } + + private fun getPreferredType(value: Int) = "$PREF=$value" } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt index a48f1f86..a21c1952 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt @@ -64,8 +64,9 @@ class VcfImporter(val activity: SimpleActivity) { } else { "" } + val preferred = getPreferredValue(it.types.lastOrNull()?.value) == 1 - phoneNumbers.add(PhoneNumber(number, type, label, number.normalizePhoneNumber())) + phoneNumbers.add(PhoneNumber(number, type, label, number.normalizePhoneNumber(), preferred)) } val emails = ArrayList() @@ -267,7 +268,7 @@ class VcfImporter(val activity: SimpleActivity) { Phone.TYPE_WORK } } - PREF, MAIN -> Phone.TYPE_MAIN + MAIN -> Phone.TYPE_MAIN WORK_FAX -> Phone.TYPE_FAX_WORK HOME_FAX -> Phone.TYPE_FAX_HOME FAX -> Phone.TYPE_FAX_WORK @@ -308,4 +309,14 @@ class VcfImporter(val activity: SimpleActivity) { return activity.getCachePhotoUri(file).toString() } + + private fun getPreferredValue(type: String?): Int { + if (type != null) { + if (type.startsWith("$PREF=".lowercase())) { + return type.split("=")[1].toInt() + } + } + + return -1 + } }