Remove link between messages and conversations

This commit is contained in:
Moez Bhatti
2018-03-29 00:35:27 -04:00
parent d26adad7bf
commit ca548d97fb
19 changed files with 112 additions and 96 deletions
@@ -33,20 +33,29 @@ class CursorToConversationImpl @Inject constructor(private val context: Context)
val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true")
val PROJECTION = arrayOf(
Threads._ID,
Threads.RECIPIENT_IDS)
Threads.DATE,
Threads.RECIPIENT_IDS,
Threads.READ,
Threads.SNIPPET)
val ID = 0
val RECIPIENT_IDS = 1
const val ID = 0
const val DATE = 1
const val RECIPIENT_IDS = 2
const val READ = 3
const val SNIPPET = 4
}
override fun map(from: Cursor): Conversation {
return Conversation().apply {
id = from.getLong(ID)
date = from.getLong(DATE)
recipients.addAll(from.getString(RECIPIENT_IDS)
.split(" ")
.filter { it.isNotBlank() }
.map { recipientId -> recipientId.toLong() }
.map { recipientId -> Recipient().apply { id = recipientId } })
read = from.getInt(READ) == 1
snippet = from.getString(SNIPPET) ?: ""
}
}
@@ -24,7 +24,6 @@ import android.net.Uri
import android.provider.Telephony.*
import com.google.android.mms.pdu_alt.PduHeaders
import manager.KeyManager
import model.Conversation
import model.Message
import util.extensions.map
import javax.inject.Inject
@@ -77,14 +76,13 @@ class CursorToMessageImpl @Inject constructor(
}
id = keys.newId()
threadId = cursor.getLong(columnsMap.threadId)
contentId = cursor.getLong(columnsMap.msgId)
date = cursor.getLong(columnsMap.date)
dateSent = cursor.getLong(columnsMap.dateSent)
read = cursor.getInt(columnsMap.read) != 0
locked = cursor.getInt(columnsMap.locked) != 0
conversation = Conversation().apply { id = cursor.getLong(columnsMap.threadId) }
when (type) {
"sms" -> {
address = cursor.getString(columnsMap.smsAddress) ?: ""