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

update to the latest commons version

Browse Source
This commit is contained in:
Mysochenko Yuriy
2022-05-27 18:12:33 +03:00
parent 706fcbf6ae
commit e1078d4379
2 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -62,7 +62,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:59f709a2a8' implementation 'com.github.SimpleMobileTools:Simple-Commons:10c8ac2f1e'
implementation 'org.greenrobot:eventbus:3.3.1' implementation 'org.greenrobot:eventbus:3.3.1'
implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61' implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
implementation 'com.github.tibbi:android-smsmms:fe58a74d59' implementation 'com.github.tibbi:android-smsmms:fe58a74d59'

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

@ -45,41 +45,52 @@ class SmsReceiver : BroadcastReceiver() {
threadId = context.getThreadId(address) threadId = context.getThreadId(address)
} }
val bitmap = getPhotoForNotification(address, context) if (context.baseConfig.blockUnknownNumbers) {
Handler(Looper.getMainLooper()).post {
val privateCursor = context.getMyContactsCursor(false, true)
val simpleContactsHelper = SimpleContactsHelper(context) val simpleContactsHelper = SimpleContactsHelper(context)
val isBlocked = context.baseConfig.blockUnknownNumbers && !simpleContactsHelper.exists(address) simpleContactsHelper.exists(address) { exists ->
if (!isBlocked && !context.isNumberBlocked(address)) { if (exists) {
ensureBackgroundThread { handleMessage(context, address, subject, body, date, read, threadId, type, subscriptionId, status)
val newMessageId = context.insertNewSMS(address, subject, body, date, read, threadId, type, subscriptionId) }
}
} else {
handleMessage(context, address, subject, body, date, read, threadId, type, subscriptionId, status)
}
}
}
val conversation = context.getConversations(threadId).firstOrNull() ?: return@ensureBackgroundThread private fun handleMessage(context: Context, address: String, subject: String, body: String, date: Long, read: Int,
try { threadId: Long, type: Int, subscriptionId: Int, status: Int) {
context.conversationsDB.insertOrUpdate(conversation) val bitmap = getPhotoForNotification(address, context)
} catch (ignored: Exception) { Handler(Looper.getMainLooper()).post {
} if (!context.isNumberBlocked(address)) {
val privateCursor = context.getMyContactsCursor(false, true)
ensureBackgroundThread {
val newMessageId = context.insertNewSMS(address, subject, body, date, read, threadId, type, subscriptionId)
try { val conversation = context.getConversations(threadId).firstOrNull() ?: return@ensureBackgroundThread
context.updateUnreadCountBadge(context.conversationsDB.getUnreadConversations()) try {
} catch (ignored: Exception) { context.conversationsDB.insertOrUpdate(conversation)
} } catch (ignored: Exception) {
val senderName = context.getNameFromAddress(address, privateCursor)
val phoneNumber = PhoneNumber(address, 0, "", address)
val participant = SimpleContact(0, 0, senderName, "", arrayListOf(phoneNumber), ArrayList(), ArrayList())
val participants = arrayListOf(participant)
val messageDate = (date / 1000).toInt()
val message =
Message(newMessageId, body, type, status, participants, messageDate, false, threadId, false, null, address, "", subscriptionId)
context.messagesDB.insertOrUpdate(message)
refreshMessages()
} }
context.showReceivedMessageNotification(address, body, threadId, bitmap) try {
context.updateUnreadCountBadge(context.conversationsDB.getUnreadConversations())
} catch (ignored: Exception) {
}
val senderName = context.getNameFromAddress(address, privateCursor)
val phoneNumber = PhoneNumber(address, 0, "", address)
val participant = SimpleContact(0, 0, senderName, "", arrayListOf(phoneNumber), ArrayList(), ArrayList())
val participants = arrayListOf(participant)
val messageDate = (date / 1000).toInt()
val message =
Message(newMessageId, body, type, status, participants, messageDate, false, threadId, false, null, address, "", subscriptionId)
context.messagesDB.insertOrUpdate(message)
refreshMessages()
} }
context.showReceivedMessageNotification(address, body, threadId, bitmap)
} }
} }
} }