fenix
/
Simple-SMS-Messenger
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improving the way contact name is fetched from number, handle some new cases

This commit is contained in:
tibbi 2020-04-03 21:04:02 +02:00
parent 715fa3174d
commit 4b16fde919
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
View File

@ -55,8 +55,16 @@ fun Context.getMessages(threadID: Int? = null): ArrayList<Message> {
val read = cursor.getIntValue(Telephony.Sms.READ) == 1
val person = cursor.getIntValue(Telephony.Sms.PERSON)
val thread = cursor.getIntValue(Telephony.Sms.THREAD_ID)
if (address != null && person != 0 && hasContactsPermission) {
address = getPersonsName(person) ?: address
if (hasContactsPermission) {
if (address != null && person != 0) {
address = getPersonsName(person) ?: address
} else if (address.areDigitsOnly()) {
val contactId = getNameFromPhoneNumber(address)
if (contactId != null) {
address = getPersonsName(contactId) ?: address
}
}
}
val message = Message(id, subject, body, type, address, date, read, thread)
@ -125,3 +133,27 @@ fun Context.getPersonsName(id: Int): String? {
return null
}
fun Context.getNameFromPhoneNumber(number: String): Int? {
val uri = CommonDataKinds.Phone.CONTENT_URI
val projection = arrayOf(
ContactsContract.Data.CONTACT_ID
)
val selection = "${CommonDataKinds.Phone.NUMBER} = ? OR ${CommonDataKinds.Phone.NORMALIZED_NUMBER} = ?"
val selectionArgs = arrayOf(number, number)
var cursor: Cursor? = null
try {
cursor = contentResolver.query(uri, projection, selection, selectionArgs, null)
if (cursor?.moveToFirst() == true) {
return cursor.getIntValue(ContactsContract.Data.CONTACT_ID)
}
} catch (e: Exception) {
showErrorToast(e)
} finally {
cursor?.close()
}
return null
}