From b52872cf1a0a1c2a5bf7716e1eec25809953668a Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 14 Aug 2019 20:40:01 +0200 Subject: [PATCH] fix #419, properly handle the contact photo at local contacts --- .../contacts/pro/helpers/LocalContactsHelper.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt index 54045fa3..b67b2405 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt @@ -117,6 +117,12 @@ class LocalContactsHelper(val context: Context) { } private fun convertContactToLocalContact(contact: Contact): LocalContact { + val photoByteArray = if (contact.photoUri.isNotEmpty()) { + getPhotoByteArray(contact.photoUri) + } else { + contact.photo?.getByteArray() + } + return getEmptyLocalContact().apply { id = if (contact.id == 0) null else contact.id prefix = contact.prefix @@ -125,7 +131,7 @@ class LocalContactsHelper(val context: Context) { surname = contact.surname suffix = contact.suffix nickname = contact.nickname - photo = getPhotoByteArray(contact.photoUri) + photo = photoByteArray phoneNumbers = contact.phoneNumbers emails = contact.emails events = contact.events