fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-02-01 00:16:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use PREF for the preference rather than the number type

Browse Source 
Co-authored-by: Pachat2000 <relsegahy@gmail.com>
This commit is contained in:
Mylloon 2023-03-04 14:24:31 +01:00
parent 241a7a9cba
commit 3ae9bc2511
No known key found for this signature in database
GPG Key ID: A82D63DFF8D1317F
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt
View File

@ -73,6 +73,9 @@ class VcfExporter {
contact.phoneNumbers.forEach { contact.phoneNumbers.forEach {
val phoneNumber = Telephone(it.value) val phoneNumber = Telephone(it.value)
phoneNumber.parameters.addType(getPhoneNumberTypeLabel(it.type, it.label)) phoneNumber.parameters.addType(getPhoneNumberTypeLabel(it.type, it.label))
if (it.isPrimary) {
phoneNumber.parameters.addType(getPreferredType(1))
}
card.addTelephoneNumber(phoneNumber) card.addTelephoneNumber(phoneNumber)
} }
@ -201,4 +204,6 @@ class VcfExporter {
StructuredPostal.TYPE_OTHER -> OTHER StructuredPostal.TYPE_OTHER -> OTHER
else -> label else -> label
} }
private fun getPreferredType(value: Int) = "$PREF=$value"
} }

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

@ -64,8 +64,9 @@ class VcfImporter(val activity: SimpleActivity) {
} else { } 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<Email>() val emails = ArrayList<Email>()
@ -267,7 +268,7 @@ class VcfImporter(val activity: SimpleActivity) {
Phone.TYPE_WORK Phone.TYPE_WORK
} }
} }
PREF, MAIN -> Phone.TYPE_MAIN MAIN -> Phone.TYPE_MAIN
WORK_FAX -> Phone.TYPE_FAX_WORK WORK_FAX -> Phone.TYPE_FAX_WORK
HOME_FAX -> Phone.TYPE_FAX_HOME HOME_FAX -> Phone.TYPE_FAX_HOME
FAX -> Phone.TYPE_FAX_WORK FAX -> Phone.TYPE_FAX_WORK
@ -308,4 +309,14 @@ class VcfImporter(val activity: SimpleActivity) {
return activity.getCachePhotoUri(file).toString() 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
}
} }