diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt index 91ec52f9..965564ba 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt @@ -1,5 +1,6 @@ package com.moez.QKSMS.data.mapper +import android.content.Context import android.database.Cursor import android.provider.Telephony.* import com.moez.QKSMS.common.util.extensions.asFlowable @@ -8,7 +9,7 @@ import io.reactivex.Flowable import timber.log.Timber import javax.inject.Inject -class CursorToMessageFlowable @Inject constructor() : Mapper> { +class CursorToMessageFlowable @Inject constructor(val context: Context) : Mapper> { override fun map(from: Cursor): Flowable { val columnsMap = MessageColumns(from) @@ -35,7 +36,7 @@ class CursorToMessageFlowable @Inject constructor() : Mapper { threadId = cursor.getLong(columnsMap.mmsThreadId) - boxId = cursor.getInt(columnsMap.mmsMessageBox) + address = getMmsAddress(id) date = cursor.getLong(columnsMap.smsDate) dateSent = cursor.getLong(columnsMap.smsDateSent) seen = cursor.getInt(columnsMap.smsSeen) != 0 @@ -47,6 +48,19 @@ class CursorToMessageFlowable @Inject constructor() : Mapper + if (cursor.moveToFirst()) { + return cursor.getString(0) + } + } + return "" + } + companion object { val CURSOR_PROJECTION = arrayOf( MmsSms.TYPE_DISCRIMINATOR_COLUMN, @@ -65,6 +79,7 @@ class CursorToMessageFlowable @Inject constructor() : Mapper { return Realm.getDefaultInstance() @@ -158,7 +160,7 @@ class MessageRepository @Inject constructor(private val context: Context) { fun addMessageFromUri(uri: Uri) { val cursor = context.contentResolver.query(uri, null, null, null, "date DESC") - CursorToMessageFlowable().map(cursor) + cursorToMessageFlowable.map(cursor) .subscribe { message -> message.insertOrUpdate() } }