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

correcting an Android OS version check

Browse Source
This commit is contained in:
Tibor Kaputa
2021-09-21 12:03:07 +02:00
committed by GitHub
parent ea9c317a11
commit cb1affb711
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesWriter.kt
View File

@@ -10,7 +10,7 @@ import com.google.android.mms.pdu_alt.PduHeaders
import com.klinker.android.send_message.Utils import com.klinker.android.send_message.Utils
import com.simplemobiletools.commons.extensions.getLongValue import com.simplemobiletools.commons.extensions.getLongValue
import com.simplemobiletools.commons.extensions.queryCursor import com.simplemobiletools.commons.extensions.queryCursor
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
@@ -92,7 +92,7 @@ class MessagesWriter(private val context: Context) {
@SuppressLint("NewApi") @SuppressLint("NewApi")
private fun mmsAddressExist(mmsAddress: MmsAddress, messageId: Long): Boolean { private fun mmsAddressExist(mmsAddress: MmsAddress, messageId: Long): Boolean {
val addressUri = if (isQPlus()) Mms.Addr.getAddrUriForMessage(messageId.toString()) else Uri.parse("content://mms/$messageId/addr") val addressUri = if (isRPlus()) Mms.Addr.getAddrUriForMessage(messageId.toString()) else Uri.parse("content://mms/$messageId/addr")
val projection = arrayOf(Mms.Addr._ID) val projection = arrayOf(Mms.Addr._ID)
val selection = "${Mms.Addr.TYPE} = ? AND ${Mms.Addr.ADDRESS} = ? AND ${Mms.Addr.MSG_ID} = ?" val selection = "${Mms.Addr.TYPE} = ? AND ${Mms.Addr.ADDRESS} = ? AND ${Mms.Addr.MSG_ID} = ?"
val selectionArgs = arrayOf(mmsAddress.type.toString(), mmsAddress.address.toString(), messageId.toString()) val selectionArgs = arrayOf(mmsAddress.type.toString(), mmsAddress.address.toString(), messageId.toString())
@@ -106,7 +106,7 @@ class MessagesWriter(private val context: Context) {
@SuppressLint("NewApi") @SuppressLint("NewApi")
private fun writeMmsAddress(mmsAddress: MmsAddress, messageId: Long) { private fun writeMmsAddress(mmsAddress: MmsAddress, messageId: Long) {
if (!mmsAddressExist(mmsAddress, messageId)) { if (!mmsAddressExist(mmsAddress, messageId)) {
val addressUri = if (isQPlus()) { val addressUri = if (isRPlus()) {
Mms.Addr.getAddrUriForMessage(messageId.toString()) Mms.Addr.getAddrUriForMessage(messageId.toString())
} else { } else {
Uri.parse("content://mms/$messageId/addr") Uri.parse("content://mms/$messageId/addr")
@@ -144,8 +144,7 @@ class MessagesWriter(private val context: Context) {
private fun mmsPartExist(mmsPart: MmsPart, messageId: Long): Boolean { private fun mmsPartExist(mmsPart: MmsPart, messageId: Long): Boolean {
val uri = Uri.parse("content://mms/${messageId}/part") val uri = Uri.parse("content://mms/${messageId}/part")
val projection = arrayOf(Mms.Part._ID) val projection = arrayOf(Mms.Part._ID)
val selection = val selection = "${Mms.Part.CONTENT_LOCATION} = ? AND ${Mms.Part.CONTENT_TYPE} = ? AND ${Mms.Part.MSG_ID} = ? AND ${Mms.Part.CONTENT_ID} = ?"
"${Mms.Part.CONTENT_LOCATION} = ? AND ${Mms.Part.CONTENT_TYPE} = ? AND ${Mms.Part.MSG_ID} = ? AND ${Mms.Part.CONTENT_ID} = ?"
val selectionArgs = arrayOf(mmsPart.contentLocation.toString(), mmsPart.contentType, messageId.toString(), mmsPart.contentId.toString()) val selectionArgs = arrayOf(mmsPart.contentLocation.toString(), mmsPart.contentType, messageId.toString(), mmsPart.contentId.toString())
var exists = false var exists = false
context.queryCursor(uri, projection, selection, selectionArgs) { context.queryCursor(uri, projection, selection, selectionArgs) {