wbrawner/Simple-Contacts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #419, properly handle the contact photo at local contacts

Browse source
This commit is contained in:
tibbi 2019-08-14 20:40:01 +02:00
parent f28ea80e93
commit b52872cf1a
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt
View file

@ -117,6 +117,12 @@ class LocalContactsHelper(val context: Context) {
} }
private fun convertContactToLocalContact(contact: Contact): LocalContact { private fun convertContactToLocalContact(contact: Contact): LocalContact {
val photoByteArray = if (contact.photoUri.isNotEmpty()) {
getPhotoByteArray(contact.photoUri)
} else {
contact.photo?.getByteArray()
}
return getEmptyLocalContact().apply { return getEmptyLocalContact().apply {
id = if (contact.id == 0) null else contact.id id = if (contact.id == 0) null else contact.id
prefix = contact.prefix prefix = contact.prefix
@ -125,7 +131,7 @@ class LocalContactsHelper(val context: Context) {
surname = contact.surname surname = contact.surname
suffix = contact.suffix suffix = contact.suffix
nickname = contact.nickname nickname = contact.nickname
photo = getPhotoByteArray(contact.photoUri) photo = photoByteArray
phoneNumbers = contact.phoneNumbers phoneNumbers = contact.phoneNumbers
emails = contact.emails emails = contact.emails
events = contact.events events = contact.events