feat: restore mms

This commit is contained in:
darthpaul 2021-09-18 16:14:58 +01:00
parent 9656207135
commit e10a410788
10 changed files with 438 additions and 142 deletions

View file

@ -42,28 +42,28 @@ class MessagesExporter(private val context: Context) {
var written = 0
writer.beginObject()
val conversationIds = context.getConversationIds()
for(threadId in conversationIds){
for (threadId in conversationIds) {
writer.name(threadId.toString())
writer.beginObject()
writer.name("threadId")
writer.value(threadId)
if(config.exportSms){
if (config.exportSms) {
writer.name("sms")
writer.beginArray()
//write all sms
messageReader.forEachSms(threadId){
messageReader.forEachSms(threadId) {
JsonObjectWriter(writer).write(it)
written++
}
writer.endArray()
}
if(config.exportMms){
if (config.exportMms) {
writer.name("mms")
writer.beginArray()
//write all mms
messageReader.forEachMms(threadId){
messageReader.forEachMms(threadId) {
JsonObjectWriter(writer).write(it)
written++
}

View file

@ -1,6 +1,7 @@
package com.simplemobiletools.smsmessenger.helpers
import android.content.Context
import android.net.Uri
import android.provider.Telephony
import android.util.Log
import com.google.gson.Gson
@ -55,7 +56,7 @@ class MessagesImporter(private val context: Context) {
// add mms
if (config.importMms) {
message.sms.forEach(messageWriter::writeMmsMessage)
message.mms.forEach(messageWriter::writeMmsMessage)
}
// messageWriter.updateAllSmsThreads()
@ -66,9 +67,20 @@ class MessagesImporter(private val context: Context) {
Log.w(TAG, "conversationIds = $conversationIds")
context.queryCursor(Telephony.Sms.CONTENT_URI) { cursor ->
val json = cursor.rowsToJson()
Log.w(TAG, "messages = $json")
Log.w(TAG, "smses = $json")
}
context.queryCursor(Telephony.Mms.CONTENT_URI) { cursor ->
val json = cursor.rowsToJson()
Log.w(TAG, "mmses = $json")
}
context.queryCursor(Uri.parse("content://mms/part")) { cursor ->
val json = cursor.rowsToJson()
Log.w(TAG, "parts = $json")
}
refreshMessages()

View file

@ -6,12 +6,9 @@ import android.net.Uri
import android.provider.Telephony
import android.util.Base64
import android.util.Log
import com.google.android.mms.pdu_alt.PduHeaders
import com.google.gson.JsonArray
import com.google.gson.JsonObject
import com.simplemobiletools.commons.extensions.getIntValue
import com.simplemobiletools.commons.extensions.getStringValue
import com.simplemobiletools.commons.extensions.queryCursor
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.isQPlus
import com.simplemobiletools.smsmessenger.extensions.optLong
import com.simplemobiletools.smsmessenger.extensions.optString
@ -23,38 +20,35 @@ class MessagesReader(private val context: Context) {
companion object {
private const val TAG = "MessagesReader"
}
fun forEachSms(threadId: Long, block: (JsonObject) -> Unit) {
forEachThreadMessage(Telephony.Sms.CONTENT_URI, threadId, block)
}
fun forEachMms(threadId: Long, includeAttachment: Boolean = true, block: (JsonObject) -> Unit) {
forEachThreadMessage(Telephony.Mms.CONTENT_URI, threadId) { obj ->
if (includeAttachment) {
obj.add("parts", getParts(obj.getAsJsonPrimitive("_id").asLong))
}
obj.add(Telephony.CanonicalAddressesColumns.ADDRESS, getMMSAddresses(obj.getAsJsonPrimitive("_id").asLong))
block(obj)
}
}
private fun forEachThreadMessage(contentUri: Uri, threadId: Long, block: (JsonObject) -> Unit) {
val selection = "${Telephony.Sms.THREAD_ID} = ?"
val selectionArgs = arrayOf(threadId.toString())
context.queryCursor(contentUri, null, selection, selectionArgs) { cursor ->
context.queryCursor(Telephony.Sms.CONTENT_URI, null, selection, selectionArgs) { cursor ->
val json = cursor.rowsToJson()
forceMillisDate(json, "date")
forceMillisDate(json, "date_sent")
block(json)
}
}
private fun forceMillisDate(message: JsonObject, field: String) {
/* sometimes the sms are in millis and the mms in secs... */
if (message.get(field).isJsonPrimitive) {
val value = message.get(field).optLong
if (value != null && value != 0L && value < 500000000000L) { // 500000000000 = Tuesday, 5 November 1985 00:53:20 GMT
message.addProperty(field, value * 1000)
}
// all mms from simple sms are non-text messages
fun forEachMms(threadId: Long, includeTextOnlyAttachment: Boolean = false, block: (JsonObject) -> Unit) {
val selection = if (includeTextOnlyAttachment) {
"${Telephony.Mms.THREAD_ID} = ? AND ${Telephony.Mms.TEXT_ONLY} = ?"
} else {
"${Telephony.Mms.THREAD_ID} = ?"
}
val selectionArgs = if (includeTextOnlyAttachment) {
arrayOf(threadId.toString(), "1")
} else {
arrayOf(threadId.toString())
}
context.queryCursor(Telephony.Mms.CONTENT_URI, null, selection, selectionArgs) { cursor ->
val json = cursor.rowsToJson()
json.add("parts", getParts(json.getAsJsonPrimitive(Telephony.Mms._ID).asLong))
json.add("addresses", getMMSAddresses(json.getAsJsonPrimitive(Telephony.Mms._ID).asLong))
block(json)
}
}
@ -67,8 +61,9 @@ class MessagesReader(private val context: Context) {
Uri.parse("content://mms/part")
}
val selection = "${Telephony.Mms.Part.MSG_ID}=$mmsId"
context.queryCursor(uri, emptyArray(), selection) { cursor ->
val selection = "${Telephony.Mms.Part.MSG_ID}= ?"
val selectionArgs = arrayOf(mmsId.toString())
context.queryCursor(uri, null, selection, selectionArgs) { cursor ->
val part = cursor.rowsToJson()
val hasTextValue = (part.has(Telephony.Mms.Part.TEXT) && !part.get(Telephony.Mms.Part.TEXT).optString.isNullOrEmpty())
@ -85,7 +80,12 @@ class MessagesReader(private val context: Context) {
}
else -> {
part.addProperty(MMS_CONTENT, usePart(part.get(Telephony.Mms.Part._ID).asLong) { stream ->
Base64.encodeToString(stream.readBytes(), Base64.DEFAULT)
val arr = stream.readBytes()
Log.d(TAG, "getParts: $arr")
Log.d(TAG, "getParts: size = ${arr.size}")
Log.d(TAG, "getParts: US_ASCII-> ${arr.toString(Charsets.US_ASCII)}")
Log.d(TAG, "getParts: UTF_8-> ${arr.toString(Charsets.UTF_8)}")
Base64.encodeToString(arr, Base64.DEFAULT)
})
}
}
@ -129,12 +129,15 @@ class MessagesReader(private val context: Context) {
}
val projection = arrayOf(Telephony.Mms.Addr.ADDRESS, Telephony.Mms.Addr.TYPE)
val selection = "${Telephony.Mms.Addr.MSG_ID}=$messageId"
val selection = "${Telephony.Mms.Addr.MSG_ID}= ?"
val selectionArgs = arrayOf(messageId.toString())
context.queryCursor(addressUri, projection, selection) { cursor ->
when (cursor.getIntValue(Telephony.Mms.Addr.TYPE)) {
PduHeaders.FROM, PduHeaders.TO, PduHeaders.CC, PduHeaders.BCC -> jsonArray.add(cursor.getStringValue(Telephony.Mms.Addr.ADDRESS))
}
context.queryCursor(addressUri, null, selection, selectionArgs) { cursor ->
val part = cursor.rowsToJson()
jsonArray.add(part)
// when (cursor.getIntValue(Telephony.Mms.Addr.TYPE)) {
// PduHeaders.FROM, PduHeaders.TO, PduHeaders.CC, PduHeaders.BCC -> jsonArray.add(cursor.getStringValue(Telephony.Mms.Addr.ADDRESS))
// }
}
return jsonArray

View file

@ -1,29 +1,40 @@
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.Mms
import android.util.Base64
import android.util.Log
import com.google.android.mms.pdu_alt.PduHeaders
import com.klinker.android.send_message.Utils
import com.simplemobiletools.commons.extensions.getLongValue
import com.simplemobiletools.commons.extensions.queryCursor
import com.simplemobiletools.commons.helpers.isQPlus
import com.simplemobiletools.smsmessenger.extensions.getThreadId
import com.simplemobiletools.smsmessenger.extensions.toContentValues
import com.simplemobiletools.smsmessenger.models.MmsAddress
import com.simplemobiletools.smsmessenger.models.MmsBackup
import com.simplemobiletools.smsmessenger.models.MmsPart
import com.simplemobiletools.smsmessenger.models.SmsBackup
import java.nio.charset.Charset
class MessagesWriter(private val context: Context) {
companion object {
private const val INVALID_ID = -1L
private const val TAG = "MessagesWriter"
}
private val contentResolver = context.contentResolver
fun writeSmsMessage(map: Map<String, String>) {
Log.w(TAG, "writeSmsMessage: map=$map")
val contentValues = map.toContentValues()
contentValues.remove(Telephony.Sms._ID)
replaceThreadId(contentValues)
fun writeSmsMessage(smsBackup: SmsBackup) {
Log.w(TAG, "writeSmsMessage: smsBackup=$smsBackup")
val contentValues = smsBackup.toContentValues()
replaceSmsThreadId(contentValues)
Log.d(TAG, "writeSmsMessage: contentValues=$contentValues")
val type = contentValues.getAsInteger(Telephony.Sms.TYPE)
Log.d(TAG, "writeSmsMessage: type=$type")
if ((type == Telephony.Sms.MESSAGE_TYPE_INBOX || type == Telephony.Sms.MESSAGE_TYPE_SENT) && !smsExist(map)) {
Log.d(TAG, "writeSmsMessage: type=${smsBackup.type}")
if ((smsBackup.type == Telephony.Sms.MESSAGE_TYPE_INBOX || smsBackup.type == Telephony.Sms.MESSAGE_TYPE_SENT) && !smsExist(smsBackup)) {
Log.d(TAG, "writeSmsMessage: Inserting SMS...")
val uri = Telephony.Sms.CONTENT_URI
Log.d(TAG, "writeSmsMessage: uri=$uri")
@ -31,21 +42,17 @@ class MessagesWriter(private val context: Context) {
}
}
private fun replaceThreadId(contentValues: ContentValues) {
private fun replaceSmsThreadId(contentValues: ContentValues) {
val address = contentValues.get(Telephony.Sms.ADDRESS)
val threadId = context.getThreadId(address.toString())
val threadId = Utils.getOrCreateThreadId(context, address.toString())
contentValues.put(Telephony.Sms.THREAD_ID, threadId)
}
fun writeMmsMessage(map: Map<String, Any>) {
}
private fun smsExist(sms: Map<String, String>): Boolean {
private fun smsExist(smsBackup: SmsBackup): Boolean {
val uri = Telephony.Sms.CONTENT_URI
val projection = arrayOf(Telephony.Sms._ID)
val selection = "${Telephony.Sms.DATE} = ? AND ${Telephony.Sms.ADDRESS} = ? AND ${Telephony.Sms.TYPE} = ?"
val selectionArgs = arrayOf(sms[Telephony.Sms.DATE] as String, sms[Telephony.Sms.ADDRESS] as String, sms[Telephony.Sms.TYPE] as String)
val selectionArgs = arrayOf(smsBackup.date.toString(), smsBackup.address, smsBackup.type.toString())
var exists = false
context.queryCursor(uri, projection, selection, selectionArgs) {
@ -57,26 +64,159 @@ class MessagesWriter(private val context: Context) {
return exists
}
private fun Map<String, String>.toSmsContentValues(): ContentValues {
val values = ContentValues()
val address = get(Telephony.Sms.ADDRESS) as String
values.put(Telephony.Sms.ADDRESS, address)
values.put(Telephony.Sms.DATE, get(Telephony.Sms.DATE))
values.put(Telephony.Sms.DATE_SENT, get(Telephony.Sms.DATE_SENT))
values.put(Telephony.Sms.BODY, get(Telephony.Sms.BODY) as String)
values.put(Telephony.Sms.TYPE, get(Telephony.Sms.TYPE))
values.put(Telephony.Sms.PROTOCOL, get(Telephony.Sms.PROTOCOL))
values.put(Telephony.Sms.SERVICE_CENTER, get(Telephony.Sms.SERVICE_CENTER))
values.put(Telephony.Sms.STATUS, get(Telephony.Sms.STATUS))
values.put(Telephony.Sms.READ, get(Telephony.Sms.READ))
values.put(Telephony.Sms.CREATOR, get(Telephony.Sms.CREATOR))
values.put(Telephony.Sms.LOCKED, get(Telephony.Sms.LOCKED))
values.put(Telephony.Sms.SUBSCRIPTION_ID, get(Telephony.Sms.SUBSCRIPTION_ID))
values.put(Telephony.Sms.THREAD_ID, context.getThreadId(address))
return values
fun writeMmsMessage(mmsBackup: MmsBackup) {
// 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, store _data in Downloads directory
// 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(Telephony.Mms.THREAD_ID, threadId)
Log.w(TAG, "writeMmsMessage: backup=$mmsBackup")
//write mms
if ((mmsBackup.messageBox == Telephony.Mms.MESSAGE_BOX_INBOX || mmsBackup.messageBox == Telephony.Mms.MESSAGE_BOX_SENT) && !mmsExist(mmsBackup)) {
contentResolver.insert(Telephony.Mms.CONTENT_URI, contentValues)
}
val messageId = getMmsId(mmsBackup)
if (messageId != INVALID_ID) {
Log.d(TAG, "writing mms addresses")
//write addresses
mmsBackup.addresses.forEach { writeMmsAddress(it, messageId) }
mmsBackup.mmsParts.forEach { writeMmsPart(it, messageId) }
} else {
Log.d(TAG, "failed to write mms message, invalid mms id")
}
} else {
Log.d(TAG, "failed to write mms message, invalid thread id")
}
}
fun updateAllSmsThreads(){
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
}
}
return if (!address.isNullOrEmpty()) {
Utils.getOrCreateThreadId(context, address)
} else {
INVALID_ID
}
}
private fun getMmsId(mmsBackup: MmsBackup): Long {
val threadId = getMmsThreadId(mmsBackup)
val uri = Telephony.Mms.CONTENT_URI
val projection = arrayOf(Telephony.Mms._ID)
val selection = "${Telephony.Mms.DATE} = ? AND ${Telephony.Mms.DATE_SENT} = ? AND ${Telephony.Mms.THREAD_ID} = ? AND ${Telephony.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(Telephony.Mms._ID)
Log.i(TAG, "getMmsId After: $id")
}
Log.i(TAG, "getMmsId: $id")
return id
}
private fun mmsExist(mmsBackup: MmsBackup): Boolean {
return getMmsId(mmsBackup) != INVALID_ID
}
@SuppressLint("NewApi")
private fun mmsAddressExist(mmsAddress: MmsAddress, messageId: Long): Boolean {
val addressUri = if (isQPlus()) {
Telephony.Mms.Addr.getAddrUriForMessage(messageId.toString())
} else {
Uri.parse("content://mms/$messageId/addr")
}
val projection = arrayOf(Telephony.Mms.Addr._ID)
val selection = "${Telephony.Mms.Addr.TYPE} = ? AND ${Telephony.Mms.Addr.ADDRESS} = ? AND ${Telephony.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
}
@SuppressLint("NewApi")
private fun writeMmsAddress(mmsAddress: MmsAddress, messageId: Long) {
if (!mmsAddressExist(mmsAddress, messageId)) {
val addressUri = if (isQPlus()) {
Telephony.Mms.Addr.getAddrUriForMessage(messageId.toString())
} else {
Uri.parse("content://mms/$messageId/addr")
}
val contentValues = mmsAddress.toContentValues()
contentValues.put(Telephony.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.mmsContent, 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)
}
}
}
@SuppressLint("NewApi")
private fun mmsPartExist(mmsPart: MmsPart, messageId: Long): Boolean {
val uri = Uri.parse("content://mms/${messageId}/part")
val projection = arrayOf(Telephony.Mms.Part._ID)
val selection =
"${Telephony.Mms.Part.CONTENT_LOCATION} = ? AND ${Telephony.Mms.Part.CT_TYPE} = ? AND ${Mms.Part.MSG_ID} = ? AND ${Telephony.Mms.Part.CONTENT_ID} = ?"
val selectionArgs = arrayOf(mmsPart.contentLocation.toString(), mmsPart.contentType.toString(), messageId.toString(), mmsPart.contentId.toString())
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