fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-02-20 13:40:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

adding some extra checks to avoid showing blocked numbers on some places

Browse Source
This commit is contained in:
tibbi 2020-04-14 10:14:05 +02:00
parent 5956aef897
commit cfda56973d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,7 +368,7 @@ fun Context.getSuggestedContacts(): ArrayList<Contact> {
queryCursor(uri, projection, selection, selectionArgs, sortOrder, showErrors = true) { cursor -> queryCursor(uri, projection, selection, selectionArgs, sortOrder, showErrors = true) { cursor ->
val senderNumber = cursor.getStringValue(Sms.ADDRESS) val senderNumber = cursor.getStringValue(Sms.ADDRESS)
val namePhoto = getNameAndPhotoFromPhoneNumber(senderNumber) val namePhoto = getNameAndPhotoFromPhoneNumber(senderNumber)
if (namePhoto == null || namePhoto.name == senderNumber) { if (namePhoto == null || namePhoto.name == senderNumber || isNumberBlocked(senderNumber)) {
return@queryCursor return@queryCursor
} }

6
app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MmsReceiver.kt
View File

@ -6,6 +6,7 @@ import com.bumptech.glide.Glide
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.smsmessenger.R import com.simplemobiletools.smsmessenger.R
import com.simplemobiletools.smsmessenger.extensions.getLatestMMS import com.simplemobiletools.smsmessenger.extensions.getLatestMMS
import com.simplemobiletools.smsmessenger.extensions.isNumberBlocked
import com.simplemobiletools.smsmessenger.extensions.showReceivedMessageNotification import com.simplemobiletools.smsmessenger.extensions.showReceivedMessageNotification
// more info at https://github.com/klinker41/android-smsmms // more info at https://github.com/klinker41/android-smsmms
@ -13,8 +14,11 @@ class MmsReceiver : com.klinker.android.send_message.MmsReceivedReceiver() {
override fun onMessageReceived(context: Context, messageUri: Uri) { override fun onMessageReceived(context: Context, messageUri: Uri) {
val mms = context.getLatestMMS() ?: return val mms = context.getLatestMMS() ?: return
val address = mms.participants.firstOrNull()?.phoneNumber ?: "" val address = mms.participants.firstOrNull()?.phoneNumber ?: ""
val size = context.resources.getDimension(R.dimen.notification_large_icon_size).toInt() if (context.isNumberBlocked(address)) {
return
}
val size = context.resources.getDimension(R.dimen.notification_large_icon_size).toInt()
ensureBackgroundThread { ensureBackgroundThread {
val glideBitmap = try { val glideBitmap = try {
Glide.with(context) Glide.with(context)

5
app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt
View File

@ -6,6 +6,7 @@ import android.content.Intent
import android.provider.Telephony import android.provider.Telephony
import com.simplemobiletools.smsmessenger.extensions.getThreadId import com.simplemobiletools.smsmessenger.extensions.getThreadId
import com.simplemobiletools.smsmessenger.extensions.insertNewSMS import com.simplemobiletools.smsmessenger.extensions.insertNewSMS
import com.simplemobiletools.smsmessenger.extensions.isNumberBlocked
import com.simplemobiletools.smsmessenger.extensions.showReceivedMessageNotification import com.simplemobiletools.smsmessenger.extensions.showReceivedMessageNotification
import com.simplemobiletools.smsmessenger.helpers.refreshMessages import com.simplemobiletools.smsmessenger.helpers.refreshMessages
@ -14,6 +15,10 @@ class SmsReceiver : BroadcastReceiver() {
val messages = Telephony.Sms.Intents.getMessagesFromIntent(intent) val messages = Telephony.Sms.Intents.getMessagesFromIntent(intent)
messages.forEach { messages.forEach {
val address = it.originatingAddress ?: "" val address = it.originatingAddress ?: ""
if (context.isNumberBlocked(address)) {
return@forEach
}
val subject = it.pseudoSubject val subject = it.pseudoSubject
val body = it.messageBody val body = it.messageBody
val date = it.timestampMillis val date = it.timestampMillis