fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-02-11 09:10:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always update SMS sent status

Browse Source 
as there's no point in handling error codes if we are not queuing the SMS for retry
This commit is contained in:
Naveen 2023-01-06 00:19:36 +05:30
parent 08ee7ac700
commit 91e562ab32
1 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt
View File

@ -9,55 +9,28 @@ import android.net.Uri
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.provider.Telephony.Sms import android.provider.Telephony.Sms
import android.telephony.SmsManager.RESULT_ERROR_GENERIC_FAILURE
import android.telephony.SmsManager.RESULT_ERROR_NO_SERVICE
import android.telephony.SmsManager.RESULT_ERROR_NULL_PDU
import android.telephony.SmsManager.RESULT_ERROR_RADIO_OFF
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.ProcessLifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner
import com.simplemobiletools.commons.extensions.getMyContactsCursor import com.simplemobiletools.commons.extensions.getMyContactsCursor
import com.simplemobiletools.commons.extensions.showErrorToast
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.smsmessenger.extensions.* import com.simplemobiletools.smsmessenger.extensions.*
import com.simplemobiletools.smsmessenger.helpers.refreshMessages import com.simplemobiletools.smsmessenger.helpers.refreshMessages
import com.simplemobiletools.smsmessenger.messaging.SendStatusReceiver import com.simplemobiletools.smsmessenger.messaging.SendStatusReceiver
/** Handles updating databases and states when a SMS message is sent. */ /** Handles updating databases and states when a SMS message is sent. */
@SuppressLint("Range")
class SmsStatusSentReceiver : SendStatusReceiver() { class SmsStatusSentReceiver : SendStatusReceiver() {
override fun updateAndroidDatabase(context: Context, intent: Intent, receiverResultCode: Int) { override fun updateAndroidDatabase(context: Context, intent: Intent, receiverResultCode: Int) {
val messageUri: Uri? = intent.data val messageUri: Uri? = intent.data
val resultCode = resultCode val resultCode = resultCode
try { val type = if (resultCode == Activity.RESULT_OK) {
when (resultCode) { Sms.MESSAGE_TYPE_SENT
Activity.RESULT_OK -> if (messageUri != null) { } else {
try { Sms.MESSAGE_TYPE_FAILED
val values = ContentValues()
values.put(Sms.Outbox.TYPE, Sms.MESSAGE_TYPE_SENT)
values.put(Sms.Outbox.READ, 1)
context.contentResolver.update(messageUri, values, null, null)
} catch (e: NullPointerException) {
updateLatestSms(context = context, type = Sms.MESSAGE_TYPE_SENT, read = 1)
}
} else {
updateLatestSms(context = context, type = Sms.MESSAGE_TYPE_FAILED, read = 1)
}
RESULT_ERROR_GENERIC_FAILURE, RESULT_ERROR_NO_SERVICE, RESULT_ERROR_NULL_PDU, RESULT_ERROR_RADIO_OFF -> {
if (messageUri != null) {
val values = ContentValues()
values.put(Sms.Outbox.TYPE, Sms.MESSAGE_TYPE_FAILED)
values.put(Sms.Outbox.READ, true)
values.put(Sms.Outbox.ERROR_CODE, resultCode)
context.contentResolver.update(messageUri, values, null, null)
} else {
updateLatestSms(context = context, type = Sms.MESSAGE_TYPE_FAILED, read = 1, resultCode = resultCode)
}
}
}
} catch (e: Exception) {
e.printStackTrace()
} }
updateSmsMessageSendingStatus(context, messageUri, type)
context.messagingUtils.maybeShowErrorToast( context.messagingUtils.maybeShowErrorToast(
resultCode = resultCode, resultCode = resultCode,
@ -65,19 +38,30 @@ class SmsStatusSentReceiver : SendStatusReceiver() {
) )
} }
private fun updateLatestSms(context: Context, type: Int, read: Int, resultCode: Int = -1) { private fun updateSmsMessageSendingStatus(context: Context, messageUri: Uri?, type: Int) {
val query = context.contentResolver.query(Sms.Outbox.CONTENT_URI, null, null, null, null) val resolver = context.contentResolver
val values = ContentValues().apply {
put(Sms.Outbox.TYPE, type)
}
if (query != null && query.moveToFirst()) { try {
val id = query.getString(query.getColumnIndex(Sms.Outbox._ID)) if (messageUri != null) {
val values = ContentValues() resolver.update(messageUri, values, null, null)
values.put(Sms.Outbox.TYPE, type) } else {
values.put(Sms.Outbox.READ, read) // mark latest sms as sent, need to check if this is still necessary (or reliable)
if (resultCode != -1) { val cursor = resolver.query(Sms.Outbox.CONTENT_URI, null, null, null, null)
values.put(Sms.Outbox.ERROR_CODE, resultCode) cursor?.use {
if (cursor.moveToFirst()) {
@SuppressLint("Range")
val id = cursor.getString(cursor.getColumnIndex(Sms.Outbox._ID))
val selection = "${Sms._ID} = ?"
val selectionArgs = arrayOf(id.toString())
resolver.update(Sms.Outbox.CONTENT_URI, values, selection, selectionArgs)
}
}
} }
context.contentResolver.update(Sms.Outbox.CONTENT_URI, values, "_id=$id", null) } catch (e: Exception) {
query.close() context.showErrorToast(e)
} }
} }