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

fix: private contact name split issue

Browse source
This commit is contained in:
ismailnurudeen 2023-03-24 14:54:23 +01:00
parent f8dacb75dc
commit 12f7628192
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
commons/src/main/kotlin/com/simplemobiletools/commons/helpers/MyContactsContentProvider.kt
View file

@ -2,7 +2,6 @@ package com.simplemobiletools.commons.helpers
import android.content.Context
import android.database.Cursor
import android.graphics.Bitmap
import android.net.Uri
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
@ -58,7 +57,6 @@ class MyContactsContentProvider {
} while (cursor.moveToNext())
}
}
} catch (ignored: Exception) {
}
return contacts
@ -88,13 +86,21 @@ class MyContactsContentProvider {
val stringsToken = object : TypeToken<ArrayList<String>>() {}.type
val birthdays = Gson().fromJson<ArrayList<String>>(birthdaysJson, stringsToken) ?: ArrayList()
val anniversaries = Gson().fromJson<ArrayList<String>>(anniversariesJson, stringsToken) ?: ArrayList()
val (firstName, middleName, surname) = name.split(" ")
val contact = Contact(id = rawId,contactId = contactId, firstName = firstName,
val names = name.split(" ")
val firstName = names.firstOrNull() ?: ""
val surname = names.lastOrNull() ?: ""
val middleName = if (names.size == 3) names[2] else ""
val contact = Contact(
id = rawId,
contactId = contactId,
firstName = firstName,
middleName = middleName,
surname = surname,
photoUri = photoUri,
phoneNumbers = phoneNumbers).also {
it.birthdays = birthdays
phoneNumbers = phoneNumbers
).also {
it.birthdays = birthdays
it.anniversaries = anniversaries
}
@ -102,7 +108,6 @@ class MyContactsContentProvider {
} while (cursor.moveToNext())
}
}
} catch (ignored: Exception) {
}
return contacts