fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-06-05 21:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

filter out blocked numbers earlier

Browse Source
This commit is contained in:
tibbi
2020-04-11 15:50:04 +02:00
parent 6544351480
commit c6f1bd8012
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,10 +72,14 @@ fun Context.getMessages(threadId: Int? = null): ArrayList<Message> {
var messages = ArrayList<Message>() var messages = ArrayList<Message>()
queryCursor(uri, projection, selection, selectionArgs, showErrors = true) { cursor -> queryCursor(uri, projection, selection, selectionArgs, showErrors = true) { cursor ->
val senderNumber = cursor.getStringValue(Sms.ADDRESS)
if (isNumberBlocked(senderNumber)) {
return@queryCursor
}
val id = cursor.getIntValue(Sms._ID) val id = cursor.getIntValue(Sms._ID)
val body = cursor.getStringValue(Sms.BODY) val body = cursor.getStringValue(Sms.BODY)
val type = cursor.getIntValue(Sms.TYPE) val type = cursor.getIntValue(Sms.TYPE)
val senderNumber = cursor.getStringValue(Sms.ADDRESS)
val namePhoto = getNameAndPhotoFromPhoneNumber(senderNumber) val namePhoto = getNameAndPhotoFromPhoneNumber(senderNumber)
val senderName = namePhoto?.name ?: "" val senderName = namePhoto?.name ?: ""
val photoUri = namePhoto?.photoUri ?: "" val photoUri = namePhoto?.photoUri ?: ""
@@ -89,13 +93,13 @@ fun Context.getMessages(threadId: Int? = null): ArrayList<Message> {
} }
messages.addAll(getMMS(threadId)) messages.addAll(getMMS(threadId))
messages = messages.sortedByDescending { it.date }.toMutableList() as ArrayList<Message> messages = messages.filter { it.participants.isNotEmpty() }
.sortedByDescending { it.date }.toMutableList() as ArrayList<Message>
if (threadId == null) { if (threadId == null) {
messages = messages.distinctBy { it.thread }.toMutableList() as ArrayList<Message> messages = messages.distinctBy { it.thread }.toMutableList() as ArrayList<Message>
} }
messages = messages.filter { !isNumberBlocked(it.participants.firstOrNull()?.phoneNumber ?: "") }.toMutableList() as ArrayList<Message>
messages = messages.filter { it.participants.isNotEmpty() }.toMutableList() as ArrayList<Message>
return messages return messages
} }