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

correcting an Android OS version check

This commit is contained in:
Tibor Kaputa 2021-09-21 12:01:41 +02:00 committed by GitHub
parent 7069230506
commit ea9c317a11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesReader.kt
View File

@ -8,6 +8,7 @@ import android.provider.Telephony.Sms
import android.util.Base64 import android.util.Base64
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.isQPlus import com.simplemobiletools.commons.helpers.isQPlus
import com.simplemobiletools.commons.helpers.isRPlus
import com.simplemobiletools.smsmessenger.models.MmsAddress import com.simplemobiletools.smsmessenger.models.MmsAddress
import com.simplemobiletools.smsmessenger.models.MmsBackup import com.simplemobiletools.smsmessenger.models.MmsBackup
import com.simplemobiletools.smsmessenger.models.MmsPart import com.simplemobiletools.smsmessenger.models.MmsPart
@ -30,6 +31,7 @@ class MessagesReader(private val context: Context) {
Sms.TYPE, Sms.TYPE,
Sms.SERVICE_CENTER Sms.SERVICE_CENTER
) )
val selection = "${Sms.THREAD_ID} = ?" val selection = "${Sms.THREAD_ID} = ?"
val selectionArgs = arrayOf(threadId.toString()) val selectionArgs = arrayOf(threadId.toString())
context.queryCursor(Sms.CONTENT_URI, projection, selection, selectionArgs) { cursor -> context.queryCursor(Sms.CONTENT_URI, projection, selection, selectionArgs) { cursor ->
@ -69,6 +71,7 @@ class MessagesReader(private val context: Context) {
Mms.SUBSCRIPTION_ID, Mms.SUBSCRIPTION_ID,
Mms.TRANSACTION_ID Mms.TRANSACTION_ID
) )
val selection = if (includeTextOnlyAttachment) { val selection = if (includeTextOnlyAttachment) {
"${Mms.THREAD_ID} = ? AND ${Mms.TEXT_ONLY} = ?" "${Mms.THREAD_ID} = ? AND ${Mms.TEXT_ONLY} = ?"
} else { } else {
@ -80,6 +83,7 @@ class MessagesReader(private val context: Context) {
} else { } else {
arrayOf(threadId.toString()) arrayOf(threadId.toString())
} }
context.queryCursor(Mms.CONTENT_URI, projection, selection, selectionArgs) { cursor -> context.queryCursor(Mms.CONTENT_URI, projection, selection, selectionArgs) { cursor ->
val mmsId = cursor.getLongValue(Mms._ID) val mmsId = cursor.getLongValue(Mms._ID)
val creator = cursor.getStringValueOrNull(Mms.CREATOR) val creator = cursor.getStringValueOrNull(Mms.CREATOR)
@ -146,6 +150,7 @@ class MessagesReader(private val context: Context) {
Mms.Part.SEQ, Mms.Part.SEQ,
Mms.Part.TEXT Mms.Part.TEXT
) )
val selection = "${Mms.Part.MSG_ID} = ?" val selection = "${Mms.Part.MSG_ID} = ?"
val selectionArgs = arrayOf(mmsId.toString()) val selectionArgs = arrayOf(mmsId.toString())
context.queryCursor(uri, projection, selection, selectionArgs) { cursor -> context.queryCursor(uri, projection, selection, selectionArgs) { cursor ->
@ -194,7 +199,7 @@ class MessagesReader(private val context: Context) {
@SuppressLint("NewApi") @SuppressLint("NewApi")
private fun getMMSAddresses(messageId: Long): List<MmsAddress> { private fun getMMSAddresses(messageId: Long): List<MmsAddress> {
val addresses = mutableListOf<MmsAddress>() val addresses = mutableListOf<MmsAddress>()
val uri = if (isQPlus()) Mms.Addr.getAddrUriForMessage(messageId.toString()) else Uri.parse("content://mms/$messageId/addr") val uri = if (isRPlus()) Mms.Addr.getAddrUriForMessage(messageId.toString()) else Uri.parse("content://mms/$messageId/addr")
val projection = arrayOf(Mms.Addr.ADDRESS, Mms.Addr.TYPE, Mms.Addr.CHARSET) val projection = arrayOf(Mms.Addr.ADDRESS, Mms.Addr.TYPE, Mms.Addr.CHARSET)
val selection = "${Mms.Addr.MSG_ID}= ?" val selection = "${Mms.Addr.MSG_ID}= ?"
val selectionArgs = arrayOf(messageId.toString()) val selectionArgs = arrayOf(messageId.toString())