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

do not show blocked number conversations on the main screen

This commit is contained in:
tibbi 2020-04-14 10:09:39 +02:00
parent ab9aa5d2ba
commit 5956aef897
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,6 +194,10 @@ fun Context.getConversations(): ArrayList<Conversation> {
val rawIds = cursor.getStringValue(Threads.RECIPIENT_IDS) val rawIds = cursor.getStringValue(Threads.RECIPIENT_IDS)
val recipientIds = rawIds.split(" ").filter { it.areDigitsOnly() }.map { it.toInt() }.toMutableList() val recipientIds = rawIds.split(" ").filter { it.areDigitsOnly() }.map { it.toInt() }.toMutableList()
val phoneNumbers = getThreadPhoneNumbers(recipientIds) val phoneNumbers = getThreadPhoneNumbers(recipientIds)
if (phoneNumbers.any { isNumberBlocked(it) }) {
return@queryCursor
}
val names = getThreadContactNames(phoneNumbers) val names = getThreadContactNames(phoneNumbers)
val title = TextUtils.join(", ", names.toTypedArray()) val title = TextUtils.join(", ", names.toTypedArray())
val photoUri = if (phoneNumbers.size == 1) getPhotoUriFromPhoneNumber(phoneNumbers.first()) else "" val photoUri = if (phoneNumbers.size == 1) getPhotoUriFromPhoneNumber(phoneNumbers.first()) else ""
@ -617,7 +621,7 @@ fun Context.getThreadId(addresses: Set<String>): Long {
fun Context.isNumberBlocked(number: String): Boolean { fun Context.isNumberBlocked(number: String): Boolean {
val blockedNumbers = getBlockedNumbers() val blockedNumbers = getBlockedNumbers()
val numberToCompare = number.trimToComparableNumber() val numberToCompare = number.trimToComparableNumber()
return blockedNumbers.map { it.numberToCompare }.contains(numberToCompare) return blockedNumbers.map { it.numberToCompare }.contains(numberToCompare) || blockedNumbers.map { it.number }.contains(numberToCompare)
} }
@SuppressLint("NewApi") @SuppressLint("NewApi")