jeena/sms-translate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: don't block *all* senders due to missing permissions or errors (#683)

Browse source
This commit is contained in:
Naveen Singh 2026-01-28 15:55:37 +05:30 • committed by GitHub
parent 7bf929de83
commit 18a1f16bcf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt
View file

@ -8,6 +8,7 @@ import org.fossify.commons.extensions.baseConfig
import org.fossify.commons.extensions.getMyContactsCursor import org.fossify.commons.extensions.getMyContactsCursor
import org.fossify.commons.extensions.isNumberBlocked import org.fossify.commons.extensions.isNumberBlocked
import org.fossify.commons.extensions.showErrorToast import org.fossify.commons.extensions.showErrorToast
import org.fossify.commons.helpers.ContactLookupResult
import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.helpers.SimpleContactsHelper
import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.helpers.ensureBackgroundThread
import org.fossify.messages.R import org.fossify.messages.R
@ -28,10 +29,9 @@ class MmsReceiver : MmsReceivedReceiver() {
override fun isAddressBlocked(context: Context, address: String): Boolean { override fun isAddressBlocked(context: Context, address: String): Boolean {
if (context.isNumberBlocked(address)) return true if (context.isNumberBlocked(address)) return true
if (context.baseConfig.blockUnknownNumbers) { if (context.baseConfig.blockUnknownNumbers) {
context.getMyContactsCursor(favoritesOnly = false, withPhoneNumbersOnly = true).use { val privateCursor = context.getMyContactsCursor(favoritesOnly = false, withPhoneNumbersOnly = true)
val isKnownContact = SimpleContactsHelper(context).existsSync(address, it) val result = SimpleContactsHelper(context).existsSync(address, privateCursor)
return !isKnownContact return result == ContactLookupResult.NotFound
}
} }
return false return false
@ -43,7 +43,7 @@ class MmsReceiver : 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.getSender()?.phoneNumbers?.first()?.normalizedNumber ?: "" val address = mms.getSender()?.phoneNumbers?.firstOrNull()?.normalizedNumber ?: ""
val size = context.resources.getDimension(R.dimen.notification_large_icon_size).toInt() val size = context.resources.getDimension(R.dimen.notification_large_icon_size).toInt()
ensureBackgroundThread { ensureBackgroundThread {
handleMmsMessage(context, mms, size, address) handleMmsMessage(context, mms, size, address)

9
app/src/main/kotlin/org/fossify/messages/receivers/SmsReceiver.kt
View file

@ -7,6 +7,7 @@ import android.provider.Telephony
import org.fossify.commons.extensions.baseConfig import org.fossify.commons.extensions.baseConfig
import org.fossify.commons.extensions.getMyContactsCursor import org.fossify.commons.extensions.getMyContactsCursor
import org.fossify.commons.extensions.isNumberBlocked import org.fossify.commons.extensions.isNumberBlocked
import org.fossify.commons.helpers.ContactLookupResult
import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.helpers.SimpleContactsHelper
import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.helpers.ensureBackgroundThread
import org.fossify.commons.models.PhoneNumber import org.fossify.commons.models.PhoneNumber
@ -47,10 +48,10 @@ class SmsReceiver : BroadcastReceiver() {
if (isMessageFilteredOut(appContext, body)) return@ensureBackgroundThread if (isMessageFilteredOut(appContext, body)) return@ensureBackgroundThread
if (appContext.isNumberBlocked(address)) return@ensureBackgroundThread if (appContext.isNumberBlocked(address)) return@ensureBackgroundThread
if (appContext.baseConfig.blockUnknownNumbers) { if (appContext.baseConfig.blockUnknownNumbers) {
appContext.getMyContactsCursor(favoritesOnly = false, withPhoneNumbersOnly = true).use { val privateCursor =
val isKnownContact = SimpleContactsHelper(appContext).existsSync(address, it) appContext.getMyContactsCursor(favoritesOnly = false, withPhoneNumbersOnly = true)
if (!isKnownContact) return@ensureBackgroundThread val result = SimpleContactsHelper(appContext).existsSync(address, privateCursor)
} if (result == ContactLookupResult.NotFound) return@ensureBackgroundThread
} }
val date = System.currentTimeMillis() val date = System.currentTimeMillis()