Cleanup code and remove logs
This commit is contained in:
darthpaul
parent
24d9988ec1
commit
04cac740ee
7 changed files with 21 additions and 222 deletions
|
|
@ -1,14 +1,11 @@
|
|||
package com.simplemobiletools.smsmessenger.helpers
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.ContentValues
|
||||
import android.content.Context
|
||||
import android.net.Uri
|
||||
import android.provider.Telephony
|
||||
import android.provider.Telephony.*
|
||||
import android.provider.Telephony.Mms
|
||||
import android.provider.Telephony.Sms
|
||||
import android.util.Base64
|
||||
import android.util.Log
|
||||
import androidx.core.content.contentValuesOf
|
||||
import com.google.android.mms.pdu_alt.PduHeaders
|
||||
import com.klinker.android.send_message.Utils
|
||||
import com.simplemobiletools.commons.extensions.getLongValue
|
||||
|
|
@ -20,43 +17,18 @@ import com.simplemobiletools.smsmessenger.models.MmsPart
|
|||
import com.simplemobiletools.smsmessenger.models.SmsBackup
|
||||
|
||||
class MessagesWriter(private val context: Context) {
|
||||
companion object {
|
||||
private const val INVALID_ID = -1L
|
||||
private const val TAG = "MessagesWriter"
|
||||
}
|
||||
|
||||
private val INVALID_ID = -1L
|
||||
private val contentResolver = context.contentResolver
|
||||
|
||||
fun writeSmsMessage(smsBackup: SmsBackup) {
|
||||
Log.w(TAG, "writeSmsMessage: smsBackup=$smsBackup")
|
||||
val contentValues = smsBackup.toContentValues()
|
||||
val threadId = Utils.getOrCreateThreadId(context, smsBackup.address)
|
||||
contentValues.put(Sms.THREAD_ID, threadId)
|
||||
Log.d(TAG, "writeSmsMessage: contentValues=$contentValues")
|
||||
Log.d(TAG, "writeSmsMessage: type=${smsBackup.type}")
|
||||
if (!smsExist(smsBackup)) {
|
||||
Log.d(TAG, "writeSmsMessage: Inserting SMS...")
|
||||
val uri = Sms.CONTENT_URI
|
||||
Log.d(TAG, "writeSmsMessage: uri=$uri")
|
||||
contentResolver.insert(Sms.CONTENT_URI, contentValues)
|
||||
} else {
|
||||
Log.w(TAG, "SMS already exists")
|
||||
}
|
||||
}
|
||||
|
||||
private fun updateThreadDate(
|
||||
threadId: Long,
|
||||
date: Long,
|
||||
) {
|
||||
Log.d(TAG, "updateThreadDate: threadId=$threadId -- date=$date")
|
||||
val selection = "${Threads._ID} = ?"
|
||||
val selectionArgs = arrayOf(threadId.toString())
|
||||
val threadValues = contentValuesOf(Threads.DATE to date)
|
||||
Log.d(TAG, "threadValues=$threadValues")
|
||||
val result = contentResolver.update(Threads.CONTENT_URI.buildUpon().appendPath(threadId.toString()).build(), threadValues, null, null)
|
||||
Log.d(TAG, "updateThreadDate: id=$result")
|
||||
}
|
||||
|
||||
private fun smsExist(smsBackup: SmsBackup): Boolean {
|
||||
val uri = Sms.CONTENT_URI
|
||||
val projection = arrayOf(Sms._ID)
|
||||
|
|
@ -65,9 +37,7 @@ class MessagesWriter(private val context: Context) {
|
|||
var exists = false
|
||||
context.queryCursor(uri, projection, selection, selectionArgs) {
|
||||
exists = it.count > 0
|
||||
Log.i(TAG, "smsExist After: $exists")
|
||||
}
|
||||
Log.i(TAG, "smsExist: $exists")
|
||||
return exists
|
||||
}
|
||||
|
||||
|
|
@ -75,41 +45,25 @@ class MessagesWriter(private val context: Context) {
|
|||
// 1. write mms msg, get the msg_id, check if mms exists before writing
|
||||
// 2. write parts - parts depend on the msg id, check if part exist before writing, write data if it is a non-text part
|
||||
// 3. write the addresses, address depends on msg id too, check if address exist before writing
|
||||
Log.w(TAG, "writeMmsMessage: backup=$mmsBackup")
|
||||
val contentValues = mmsBackup.toContentValues()
|
||||
val threadId = getMmsThreadId(mmsBackup)
|
||||
if (threadId != INVALID_ID) {
|
||||
contentValues.put(Mms.THREAD_ID, threadId)
|
||||
Log.w(TAG, "writeMmsMessage: backup=$mmsBackup")
|
||||
//write mms
|
||||
if (!mmsExist(mmsBackup)) {
|
||||
contentResolver.insert(Mms.CONTENT_URI, contentValues)
|
||||
} else {
|
||||
Log.w(TAG, "mms already exists")
|
||||
}
|
||||
val messageId = getMmsId(mmsBackup)
|
||||
if (messageId != INVALID_ID) {
|
||||
Log.d(TAG, "writing mms addresses")
|
||||
//write addresses
|
||||
mmsBackup.addresses.forEach { writeMmsAddress(it, messageId) }
|
||||
mmsBackup.parts.forEach { writeMmsPart(it, messageId) }
|
||||
} else {
|
||||
Log.d(TAG, "failed to write mms message, invalid mms id")
|
||||
mmsBackup.addresses.forEach { writeMmsAddress(it, messageId) }
|
||||
}
|
||||
} else {
|
||||
Log.d(TAG, "failed to write mms message, invalid thread id")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private fun getMmsThreadId(mmsBackup: MmsBackup): Long {
|
||||
val address = when (mmsBackup.messageBox) {
|
||||
Mms.MESSAGE_BOX_INBOX -> {
|
||||
mmsBackup.addresses.firstOrNull { it.type == PduHeaders.FROM }?.address
|
||||
}
|
||||
else -> {
|
||||
mmsBackup.addresses.firstOrNull { it.type == PduHeaders.TO }?.address
|
||||
}
|
||||
Mms.MESSAGE_BOX_INBOX -> mmsBackup.addresses.firstOrNull { it.type == PduHeaders.FROM }?.address
|
||||
else -> mmsBackup.addresses.firstOrNull { it.type == PduHeaders.TO }?.address
|
||||
}
|
||||
return if (!address.isNullOrEmpty()) {
|
||||
Utils.getOrCreateThreadId(context, address)
|
||||
|
|
@ -124,13 +78,10 @@ class MessagesWriter(private val context: Context) {
|
|||
val projection = arrayOf(Mms._ID)
|
||||
val selection = "${Mms.DATE} = ? AND ${Mms.DATE_SENT} = ? AND ${Mms.THREAD_ID} = ? AND ${Mms.MESSAGE_BOX} = ?"
|
||||
val selectionArgs = arrayOf(mmsBackup.date.toString(), mmsBackup.dateSent.toString(), threadId.toString(), mmsBackup.messageBox.toString())
|
||||
|
||||
var id = INVALID_ID
|
||||
context.queryCursor(uri, projection, selection, selectionArgs) {
|
||||
id = it.getLongValue(Mms._ID)
|
||||
Log.i(TAG, "getMmsId After: $id")
|
||||
}
|
||||
Log.i(TAG, "getMmsId: $id")
|
||||
|
||||
return id
|
||||
}
|
||||
|
|
@ -141,22 +92,14 @@ class MessagesWriter(private val context: Context) {
|
|||
|
||||
@SuppressLint("NewApi")
|
||||
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 (isQPlus()) Mms.Addr.getAddrUriForMessage(messageId.toString()) else Uri.parse("content://mms/$messageId/addr")
|
||||
val projection = arrayOf(Mms.Addr._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())
|
||||
|
||||
var exists = false
|
||||
context.queryCursor(addressUri, projection, selection, selectionArgs) {
|
||||
exists = it.count > 0
|
||||
Log.i(TAG, "mmsAddressExist After: $exists")
|
||||
}
|
||||
Log.i(TAG, "mmsAddressExist: $exists")
|
||||
|
||||
return exists
|
||||
}
|
||||
|
||||
|
|
@ -172,37 +115,27 @@ class MessagesWriter(private val context: Context) {
|
|||
val contentValues = mmsAddress.toContentValues()
|
||||
contentValues.put(Mms.Addr.MSG_ID, messageId)
|
||||
contentResolver.insert(addressUri, contentValues)
|
||||
} else {
|
||||
Log.w(TAG, "writeMmsAddress: Skip already exists")
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressLint("NewApi")
|
||||
private fun writeMmsPart(mmsPart: MmsPart, messageId: Long) {
|
||||
Log.d(TAG, "writeMmsPart: Writing part= $mmsPart")
|
||||
if (!mmsPartExist(mmsPart, messageId)) {
|
||||
val uri = Uri.parse("content://mms/${messageId}/part")
|
||||
val contentValues = mmsPart.toContentValues()
|
||||
contentValues.put(Mms.Part.MSG_ID, messageId)
|
||||
val partUri = contentResolver.insert(uri, contentValues)
|
||||
//write data
|
||||
Log.d(TAG, "writeMmsPart: Inserted part=$partUri")
|
||||
try {
|
||||
if (partUri != null) {
|
||||
if (mmsPart.isNonText()) {
|
||||
contentResolver.openOutputStream(partUri).use {
|
||||
val arr = Base64.decode(mmsPart.data, Base64.DEFAULT)
|
||||
it!!.write(arr)
|
||||
Log.d(TAG, "Wrote part data $mmsPart")
|
||||
}
|
||||
} else {
|
||||
Log.w(TAG, "skip writing text content")
|
||||
}
|
||||
} else {
|
||||
Log.e(TAG, "invalid uri while writing part")
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
Log.e(TAG, "writeMmsPart: uri", e)
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -217,17 +150,7 @@ class MessagesWriter(private val context: Context) {
|
|||
var exists = false
|
||||
context.queryCursor(uri, projection, selection, selectionArgs) {
|
||||
exists = it.count > 0
|
||||
Log.i(TAG, "mmsPartExist After: $exists")
|
||||
}
|
||||
Log.i(TAG, "mmsPartExist: $exists")
|
||||
|
||||
return exists
|
||||
}
|
||||
|
||||
fun updateAllSmsThreads() {
|
||||
// thread dates + states might be wrong, we need to force a full update
|
||||
// unfortunately there's no direct way to do that in the SDK, but passing a
|
||||
// negative conversation id to delete should to the trick
|
||||
contentResolver.delete(Sms.Conversations.CONTENT_URI.buildUpon().appendPath("-1").build(), null, null)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue