mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-22 21:58:53 +01:00
Create mapper for Message -> MessageFlowable
This commit is contained in:
@@ -0,0 +1,125 @@
|
|||||||
|
package com.moez.QKSMS.data.mapper
|
||||||
|
|
||||||
|
import android.database.Cursor
|
||||||
|
import android.provider.Telephony
|
||||||
|
import com.moez.QKSMS.common.util.extensions.asFlowable
|
||||||
|
import com.moez.QKSMS.data.model.Message
|
||||||
|
import io.reactivex.Flowable
|
||||||
|
import timber.log.Timber
|
||||||
|
|
||||||
|
object CursorToMessageFlowable {
|
||||||
|
|
||||||
|
fun map(cursor: Cursor): Flowable<Message> {
|
||||||
|
val messageColumns = MessageColumns(cursor)
|
||||||
|
return cursor.asFlowable().map { cursor -> cursorToMessage(cursor, messageColumns) }
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun cursorToMessage(cursor: Cursor, columnsMap: MessageColumns): Message {
|
||||||
|
return Message().apply {
|
||||||
|
type = when (cursor.getColumnIndex(Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN)) {
|
||||||
|
-1 -> "sms"
|
||||||
|
else -> cursor.getString(columnsMap.msgType)
|
||||||
|
}
|
||||||
|
|
||||||
|
id = cursor.getLong(columnsMap.msgId)
|
||||||
|
body = cursor.getString(columnsMap.smsBody) ?: ""
|
||||||
|
|
||||||
|
when (type) {
|
||||||
|
"sms" -> {
|
||||||
|
threadId = cursor.getLong(columnsMap.smsThreadId)
|
||||||
|
address = cursor.getString(columnsMap.smsAddress)
|
||||||
|
boxId = cursor.getInt(columnsMap.smsType)
|
||||||
|
date = cursor.getLong(columnsMap.mmsDate)
|
||||||
|
dateSent = cursor.getLong(columnsMap.mmsDateSent)
|
||||||
|
seen = cursor.getInt(columnsMap.mmsSeen) != 0
|
||||||
|
read = cursor.getInt(columnsMap.mmsRead) != 0
|
||||||
|
}
|
||||||
|
|
||||||
|
"mms" -> {
|
||||||
|
threadId = cursor.getLong(columnsMap.mmsThreadId)
|
||||||
|
boxId = cursor.getInt(columnsMap.mmsMessageBox)
|
||||||
|
date = cursor.getLong(columnsMap.smsDate)
|
||||||
|
dateSent = cursor.getLong(columnsMap.smsDateSent)
|
||||||
|
seen = cursor.getInt(columnsMap.smsSeen) != 0
|
||||||
|
read = cursor.getInt(columnsMap.smsRead) != 0
|
||||||
|
errorType = cursor.getInt(columnsMap.mmsErrorType)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val CURSOR_PROJECTION = arrayOf(
|
||||||
|
Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN,
|
||||||
|
Telephony.MmsSms._ID,
|
||||||
|
|
||||||
|
Telephony.Sms.THREAD_ID,
|
||||||
|
Telephony.Sms.ADDRESS,
|
||||||
|
Telephony.Sms.BODY,
|
||||||
|
Telephony.Sms.DATE,
|
||||||
|
Telephony.Sms.DATE_SENT,
|
||||||
|
Telephony.Sms.SEEN,
|
||||||
|
Telephony.Sms.READ,
|
||||||
|
Telephony.Sms.TYPE,
|
||||||
|
Telephony.Sms.STATUS,
|
||||||
|
Telephony.Sms.LOCKED,
|
||||||
|
Telephony.Sms.ERROR_CODE,
|
||||||
|
|
||||||
|
Telephony.Mms.THREAD_ID,
|
||||||
|
Telephony.Mms.SUBJECT,
|
||||||
|
Telephony.Mms.SUBJECT_CHARSET,
|
||||||
|
Telephony.Mms.DATE,
|
||||||
|
Telephony.Mms.DATE_SENT,
|
||||||
|
Telephony.Mms.SEEN,
|
||||||
|
Telephony.Mms.READ,
|
||||||
|
Telephony.Mms.MESSAGE_TYPE,
|
||||||
|
Telephony.Mms.MESSAGE_BOX,
|
||||||
|
Telephony.Mms.DELIVERY_REPORT,
|
||||||
|
Telephony.Mms.READ_REPORT,
|
||||||
|
Telephony.MmsSms.PendingMessages.ERROR_TYPE,
|
||||||
|
Telephony.Mms.LOCKED,
|
||||||
|
Telephony.Mms.STATUS,
|
||||||
|
Telephony.Mms.TEXT_ONLY)
|
||||||
|
|
||||||
|
private class MessageColumns(val cursor: Cursor) {
|
||||||
|
|
||||||
|
val msgType by lazy { getColumnIndex(Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN) }
|
||||||
|
val msgId by lazy { getColumnIndex(Telephony.MmsSms._ID) }
|
||||||
|
|
||||||
|
val smsThreadId by lazy { getColumnIndex(Telephony.Sms.THREAD_ID) }
|
||||||
|
val smsAddress by lazy { getColumnIndex(Telephony.Sms.ADDRESS) }
|
||||||
|
val smsBody by lazy { getColumnIndex(Telephony.Sms.BODY) }
|
||||||
|
val smsDate by lazy { getColumnIndex(Telephony.Sms.DATE) }
|
||||||
|
val smsDateSent by lazy { getColumnIndex(Telephony.Sms.DATE_SENT) }
|
||||||
|
val smsSeen by lazy { getColumnIndex(Telephony.Sms.SEEN) }
|
||||||
|
val smsRead by lazy { getColumnIndex(Telephony.Sms.READ) }
|
||||||
|
val smsType by lazy { getColumnIndex(Telephony.Sms.TYPE) }
|
||||||
|
val smsStatus by lazy { getColumnIndex(Telephony.Sms.STATUS) }
|
||||||
|
val smsLocked by lazy { getColumnIndex(Telephony.Sms.LOCKED) }
|
||||||
|
val smsErrorCode by lazy { getColumnIndex(Telephony.Sms.ERROR_CODE) }
|
||||||
|
|
||||||
|
val mmsThreadId by lazy { getColumnIndex(Telephony.Mms.THREAD_ID) }
|
||||||
|
val mmsSubject by lazy { getColumnIndex(Telephony.Mms.SUBJECT) }
|
||||||
|
val mmsSubjectCharset by lazy { getColumnIndex(Telephony.Mms.SUBJECT_CHARSET) }
|
||||||
|
val mmsDate by lazy { getColumnIndex(Telephony.Mms.DATE) }
|
||||||
|
val mmsDateSent by lazy { getColumnIndex(Telephony.Mms.DATE_SENT) }
|
||||||
|
val mmsSeen by lazy { getColumnIndex(Telephony.Mms.SEEN) }
|
||||||
|
val mmsRead by lazy { getColumnIndex(Telephony.Mms.READ) }
|
||||||
|
val mmsMessageType by lazy { getColumnIndex(Telephony.Mms.MESSAGE_TYPE) }
|
||||||
|
val mmsMessageBox by lazy { getColumnIndex(Telephony.Mms.MESSAGE_BOX) }
|
||||||
|
val mmsDeliveryReport by lazy { getColumnIndex(Telephony.Mms.DELIVERY_REPORT) }
|
||||||
|
val mmsReadReport by lazy { getColumnIndex(Telephony.Mms.READ_REPORT) }
|
||||||
|
val mmsErrorType by lazy { getColumnIndex(Telephony.MmsSms.PendingMessages.ERROR_TYPE) }
|
||||||
|
val mmsLocked by lazy { getColumnIndex(Telephony.Mms.LOCKED) }
|
||||||
|
val mmsStatus by lazy { getColumnIndex(Telephony.Mms.STATUS) }
|
||||||
|
val mmsTextOnly by lazy { getColumnIndex(Telephony.Mms.TEXT_ONLY) }
|
||||||
|
|
||||||
|
private fun getColumnIndex(columnsName: String): Int {
|
||||||
|
return try {
|
||||||
|
cursor.getColumnIndexOrThrow(columnsName)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Timber.w(e)
|
||||||
|
-1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,10 +7,9 @@ import android.provider.BaseColumns
|
|||||||
import android.provider.Telephony
|
import android.provider.Telephony
|
||||||
import com.moez.QKSMS.common.util.extensions.asFlowable
|
import com.moez.QKSMS.common.util.extensions.asFlowable
|
||||||
import com.moez.QKSMS.common.util.extensions.insertOrUpdate
|
import com.moez.QKSMS.common.util.extensions.insertOrUpdate
|
||||||
|
import com.moez.QKSMS.data.mapper.CursorToMessageFlowable
|
||||||
import com.moez.QKSMS.data.model.Conversation
|
import com.moez.QKSMS.data.model.Conversation
|
||||||
import com.moez.QKSMS.data.model.Message
|
import com.moez.QKSMS.data.model.Message
|
||||||
import com.moez.QKSMS.data.sync.MessageColumns
|
|
||||||
import com.moez.QKSMS.data.sync.SyncManager
|
|
||||||
import io.reactivex.Flowable
|
import io.reactivex.Flowable
|
||||||
import io.reactivex.schedulers.Schedulers
|
import io.reactivex.schedulers.Schedulers
|
||||||
import io.realm.Realm
|
import io.realm.Realm
|
||||||
@@ -127,12 +126,8 @@ class MessageRepository @Inject constructor(private val context: Context) {
|
|||||||
|
|
||||||
fun addMessageFromUri(uri: Uri) {
|
fun addMessageFromUri(uri: Uri) {
|
||||||
val cursor = context.contentResolver.query(uri, null, null, null, "date DESC")
|
val cursor = context.contentResolver.query(uri, null, null, null, "date DESC")
|
||||||
if (cursor.moveToFirst()) {
|
CursorToMessageFlowable.map(cursor)
|
||||||
val columns = MessageColumns(cursor)
|
.subscribe { message -> message.insertOrUpdate() }
|
||||||
val message = SyncManager.messageFromCursor(cursor, columns)
|
|
||||||
message.insertOrUpdate()
|
|
||||||
}
|
|
||||||
cursor.close()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
package com.moez.QKSMS.data.sync
|
|
||||||
|
|
||||||
import android.database.Cursor
|
|
||||||
import android.net.Uri
|
|
||||||
import android.provider.Telephony.*
|
|
||||||
import timber.log.Timber
|
|
||||||
|
|
||||||
@Suppress("unused")
|
|
||||||
class MessageColumns(val cursor: Cursor) {
|
|
||||||
private val TAG = "ColumnsMap"
|
|
||||||
private val DEBUG = false
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
val URI: Uri = Uri.parse("content://mms-sms/conversations/")
|
|
||||||
val PROJECTION = arrayOf(
|
|
||||||
MmsSms.TYPE_DISCRIMINATOR_COLUMN,
|
|
||||||
MmsSms._ID,
|
|
||||||
|
|
||||||
Sms.THREAD_ID,
|
|
||||||
Sms.ADDRESS,
|
|
||||||
Sms.BODY,
|
|
||||||
Sms.DATE,
|
|
||||||
Sms.DATE_SENT,
|
|
||||||
Sms.SEEN,
|
|
||||||
Sms.READ,
|
|
||||||
Sms.TYPE,
|
|
||||||
Sms.STATUS,
|
|
||||||
Sms.LOCKED,
|
|
||||||
Sms.ERROR_CODE,
|
|
||||||
|
|
||||||
Mms.THREAD_ID,
|
|
||||||
Mms.SUBJECT,
|
|
||||||
Mms.SUBJECT_CHARSET,
|
|
||||||
Mms.DATE,
|
|
||||||
Mms.DATE_SENT,
|
|
||||||
Mms.SEEN,
|
|
||||||
Mms.READ,
|
|
||||||
Mms.MESSAGE_TYPE,
|
|
||||||
Mms.MESSAGE_BOX,
|
|
||||||
Mms.DELIVERY_REPORT,
|
|
||||||
Mms.READ_REPORT,
|
|
||||||
MmsSms.PendingMessages.ERROR_TYPE,
|
|
||||||
Mms.LOCKED,
|
|
||||||
Mms.STATUS,
|
|
||||||
Mms.TEXT_ONLY)
|
|
||||||
}
|
|
||||||
|
|
||||||
val msgType by lazy { getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) }
|
|
||||||
val msgId by lazy { getColumnIndex(MmsSms._ID) }
|
|
||||||
|
|
||||||
val smsThreadId by lazy { getColumnIndex(Sms.THREAD_ID) }
|
|
||||||
val smsAddress by lazy { getColumnIndex(Sms.ADDRESS) }
|
|
||||||
val smsBody by lazy { getColumnIndex(Sms.BODY) }
|
|
||||||
val smsDate by lazy { getColumnIndex(Sms.DATE) }
|
|
||||||
val smsDateSent by lazy { getColumnIndex(Sms.DATE_SENT) }
|
|
||||||
val smsSeen by lazy { getColumnIndex(Sms.SEEN) }
|
|
||||||
val smsRead by lazy { getColumnIndex(Sms.READ) }
|
|
||||||
val smsType by lazy { getColumnIndex(Sms.TYPE) }
|
|
||||||
val smsStatus by lazy { getColumnIndex(Sms.STATUS) }
|
|
||||||
val smsLocked by lazy { getColumnIndex(Sms.LOCKED) }
|
|
||||||
val smsErrorCode by lazy { getColumnIndex(Sms.ERROR_CODE) }
|
|
||||||
|
|
||||||
val mmsThreadId by lazy { getColumnIndex(Mms.THREAD_ID) }
|
|
||||||
val mmsSubject by lazy { getColumnIndex(Mms.SUBJECT) }
|
|
||||||
val mmsSubjectCharset by lazy { getColumnIndex(Mms.SUBJECT_CHARSET) }
|
|
||||||
val mmsDate by lazy { getColumnIndex(Mms.DATE) }
|
|
||||||
val mmsDateSent by lazy { getColumnIndex(Mms.DATE_SENT) }
|
|
||||||
val mmsSeen by lazy { getColumnIndex(Mms.SEEN) }
|
|
||||||
val mmsRead by lazy { getColumnIndex(Mms.READ) }
|
|
||||||
val mmsMessageType by lazy { getColumnIndex(Mms.MESSAGE_TYPE) }
|
|
||||||
val mmsMessageBox by lazy { getColumnIndex(Mms.MESSAGE_BOX) }
|
|
||||||
val mmsDeliveryReport by lazy { getColumnIndex(Mms.DELIVERY_REPORT) }
|
|
||||||
val mmsReadReport by lazy { getColumnIndex(Mms.READ_REPORT) }
|
|
||||||
val mmsErrorType by lazy { getColumnIndex(MmsSms.PendingMessages.ERROR_TYPE) }
|
|
||||||
val mmsLocked by lazy { getColumnIndex(Mms.LOCKED) }
|
|
||||||
val mmsStatus by lazy { getColumnIndex(Mms.STATUS) }
|
|
||||||
val mmsTextOnly by lazy { getColumnIndex(Mms.TEXT_ONLY) }
|
|
||||||
|
|
||||||
private fun getColumnIndex(columnsName: String): Int {
|
|
||||||
return try {
|
|
||||||
cursor.getColumnIndexOrThrow(columnsName)
|
|
||||||
} catch (e: Exception) {
|
|
||||||
Timber.w(e)
|
|
||||||
-1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -5,8 +5,8 @@ import android.database.Cursor
|
|||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.Telephony
|
import android.provider.Telephony
|
||||||
import com.moez.QKSMS.common.util.extensions.asFlowable
|
import com.moez.QKSMS.common.util.extensions.asFlowable
|
||||||
|
import com.moez.QKSMS.data.mapper.CursorToMessageFlowable
|
||||||
import com.moez.QKSMS.data.model.Conversation
|
import com.moez.QKSMS.data.model.Conversation
|
||||||
import com.moez.QKSMS.data.model.Message
|
|
||||||
import com.moez.QKSMS.data.repository.ContactRepository
|
import com.moez.QKSMS.data.repository.ContactRepository
|
||||||
import io.reactivex.Flowable
|
import io.reactivex.Flowable
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||||
@@ -19,7 +19,6 @@ import javax.inject.Singleton
|
|||||||
class SyncManager @Inject constructor(val context: Context, private val contactsRepo: ContactRepository) {
|
class SyncManager @Inject constructor(val context: Context, private val contactsRepo: ContactRepository) {
|
||||||
|
|
||||||
fun copyToRealm(completionListener: () -> Unit) {
|
fun copyToRealm(completionListener: () -> Unit) {
|
||||||
|
|
||||||
val contentResolver = context.contentResolver
|
val contentResolver = context.contentResolver
|
||||||
val conversationsCursor = contentResolver.query(ConversationColumns.URI, ConversationColumns.PROJECTION, null, null, "date desc")
|
val conversationsCursor = contentResolver.query(ConversationColumns.URI, ConversationColumns.PROJECTION, null, null, "date desc")
|
||||||
|
|
||||||
@@ -39,10 +38,9 @@ class SyncManager @Inject constructor(val context: Context, private val contacts
|
|||||||
.doOnNext { conversation -> realm?.insertOrUpdate(conversation) }
|
.doOnNext { conversation -> realm?.insertOrUpdate(conversation) }
|
||||||
.map { conversation -> conversation.id }
|
.map { conversation -> conversation.id }
|
||||||
.flatMap { threadId ->
|
.flatMap { threadId ->
|
||||||
val uri = Uri.withAppendedPath(MessageColumns.URI, threadId.toString())
|
val uri = Uri.withAppendedPath(Telephony.MmsSms.CONTENT_CONVERSATIONS_URI, threadId.toString())
|
||||||
val messagesCursor = contentResolver.query(uri, MessageColumns.PROJECTION, null, null, "date desc")
|
val messagesCursor = contentResolver.query(uri, CursorToMessageFlowable.CURSOR_PROJECTION, null, null, "date desc")
|
||||||
val columnsMap = MessageColumns(messagesCursor)
|
CursorToMessageFlowable.map(messagesCursor)
|
||||||
messagesCursor.asFlowable().map { cursor -> messageFromCursor(cursor, columnsMap) }
|
|
||||||
}
|
}
|
||||||
.filter { message -> message.type == "sms" || message.type == "mms" }
|
.filter { message -> message.type == "sms" || message.type == "mms" }
|
||||||
.distinct { message -> message.id }
|
.distinct { message -> message.id }
|
||||||
@@ -68,41 +66,4 @@ class SyncManager @Inject constructor(val context: Context, private val contacts
|
|||||||
.forEach { contact -> contacts.add(contact) }
|
.forEach { contact -> contacts.add(contact) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO take this out of the companion object
|
|
||||||
companion object {
|
|
||||||
fun messageFromCursor(cursor: Cursor, columnsMap: MessageColumns): Message {
|
|
||||||
return Message().apply {
|
|
||||||
type = when (cursor.getColumnIndex(Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN)) {
|
|
||||||
-1 -> "sms"
|
|
||||||
else -> cursor.getString(columnsMap.msgType)
|
|
||||||
}
|
|
||||||
|
|
||||||
id = cursor.getLong(columnsMap.msgId)
|
|
||||||
body = cursor.getString(columnsMap.smsBody) ?: ""
|
|
||||||
|
|
||||||
when (type) {
|
|
||||||
"sms" -> {
|
|
||||||
threadId = cursor.getLong(columnsMap.smsThreadId)
|
|
||||||
address = cursor.getString(columnsMap.smsAddress)
|
|
||||||
boxId = cursor.getInt(columnsMap.smsType)
|
|
||||||
date = cursor.getLong(columnsMap.mmsDate)
|
|
||||||
dateSent = cursor.getLong(columnsMap.mmsDateSent)
|
|
||||||
seen = cursor.getInt(columnsMap.mmsSeen) != 0
|
|
||||||
read = cursor.getInt(columnsMap.mmsRead) != 0
|
|
||||||
}
|
|
||||||
|
|
||||||
"mms" -> {
|
|
||||||
threadId = cursor.getLong(columnsMap.mmsThreadId)
|
|
||||||
boxId = cursor.getInt(columnsMap.mmsMessageBox)
|
|
||||||
date = cursor.getLong(columnsMap.smsDate)
|
|
||||||
dateSent = cursor.getLong(columnsMap.smsDateSent)
|
|
||||||
seen = cursor.getInt(columnsMap.smsSeen) != 0
|
|
||||||
read = cursor.getInt(columnsMap.smsRead) != 0
|
|
||||||
errorType = cursor.getInt(columnsMap.mmsErrorType)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user