diff --git a/qksms/src/main/java/data/mapper/CursorToMessage.kt b/qksms/src/main/java/data/mapper/CursorToMessage.kt index 3caa8e7d..11224334 100644 --- a/qksms/src/main/java/data/mapper/CursorToMessage.kt +++ b/qksms/src/main/java/data/mapper/CursorToMessage.kt @@ -21,17 +21,21 @@ package data.mapper import android.content.Context import android.database.Cursor import android.net.Uri +import android.provider.Telephony import android.provider.Telephony.* import com.google.android.mms.pdu_alt.PduHeaders import common.util.Keys +import common.util.extensions.map import data.model.Message +import data.model.MmsPart import timber.log.Timber import java.util.* import javax.inject.Inject class CursorToMessage @Inject constructor( private val context: Context, - private val keys: Keys + private val keys: Keys, + private val cursorToPart: CursorToPart ) : Mapper, Message> { override fun map(from: Pair): Message { @@ -78,7 +82,9 @@ class CursorToMessage @Inject constructor( mmsStatus = cursor.getInt(columnsMap.mmsStatus) subject = cursor.getString(columnsMap.mmsSubject) ?: "" textContentType = "" - attachmentType = Message.AttachmentType.NOT_LOADED + attachmentType = Message.AttachmentType.NOT_LOADED + + parts.addAll(getMmsParts(contentId)) } } } @@ -104,6 +110,12 @@ class CursorToMessage @Inject constructor( return "" } + private fun getMmsParts(contentId: Long): List { + return context.contentResolver.query(CursorToPart.CONTENT_URI, null, + "${Telephony.Mms.Part.MSG_ID} = ?", arrayOf(contentId.toString()), null) + .map { cursorToPart.map(it) } + } + companion object { val URI = Uri.parse("content://mms-sms/complete-conversations") val PROJECTION = arrayOf( diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index 8a9cec55..cab4875b 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -142,20 +142,6 @@ class MessageRepository @Inject constructor( .findAllSorted("date") } - fun loadParts(id: Long) { - Realm.getDefaultInstance()?.use { realm -> - realm.where(Message::class.java).equalTo("id", id).findFirst()?.let { message -> - realm.executeTransaction { - val parts = realm.copyToRealmOrUpdate(context.contentResolver.query(CursorToPart.CONTENT_URI, null, - "${Telephony.Mms.Part.MSG_ID} = ?", arrayOf(message.contentId.toString()), null) - .map { cursorToPart.map(it) }) - - message.parts = RealmList().apply { addAll(parts) } - } - } - } - } - /** * Retrieves the list of messages which should be shown in the notification * for a given conversation diff --git a/qksms/src/main/java/interactor/LoadMmsParts.kt b/qksms/src/main/java/interactor/LoadMmsParts.kt deleted file mode 100644 index cec4e325..00000000 --- a/qksms/src/main/java/interactor/LoadMmsParts.kt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package interactor - -import data.repository.MessageRepository -import io.reactivex.Flowable -import javax.inject.Inject - -class LoadMmsParts @Inject constructor(private val messageRepo: MessageRepository): Interactor() { - - override fun buildObservable(params: Long): Flowable { - return Flowable.just(params) - .doOnNext { messageId -> messageRepo.loadParts(messageId) } - } - -} \ No newline at end of file diff --git a/qksms/src/main/java/interactor/ReceiveMms.kt b/qksms/src/main/java/interactor/ReceiveMms.kt index eed4f91c..d71c2c40 100644 --- a/qksms/src/main/java/interactor/ReceiveMms.kt +++ b/qksms/src/main/java/interactor/ReceiveMms.kt @@ -36,7 +36,6 @@ class ReceiveMms @Inject constructor( override fun buildObservable(params: Uri): Flowable { return Flowable.just(params) .flatMap { uri -> syncManager.syncMessage(uri) } // Sync the message - .doOnNext { message -> messageRepo.loadParts(message.id) } // Sync the message parts .mapNotNull { message -> messageRepo.getOrCreateConversation(message.threadId) } // Map message to conversation .doOnNext { conversation -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary .doOnNext { conversation -> notificationManager.update(conversation.id) } // Update the notification diff --git a/qksms/src/main/java/interactor/SyncMessage.kt b/qksms/src/main/java/interactor/SyncMessage.kt index c7b2c741..6b05fdae 100644 --- a/qksms/src/main/java/interactor/SyncMessage.kt +++ b/qksms/src/main/java/interactor/SyncMessage.kt @@ -33,11 +33,6 @@ class SyncMessage @Inject constructor( override fun buildObservable(params: Uri): Flowable { return Flowable.just(params) .flatMap { uri -> syncManager.syncMessage(uri) } - .doOnNext { message -> - if (message.isMms()) { - messageRepo.loadParts(message.id) - } - } } } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt index 3ba31cc6..8da415e0 100644 --- a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt @@ -34,7 +34,6 @@ import common.util.extensions.setVisible import data.model.Contact import data.model.Message import data.model.PhoneNumber -import interactor.LoadMmsParts import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject @@ -48,8 +47,7 @@ import javax.inject.Inject class MessagesAdapter @Inject constructor( private val context: Context, private val colors: Colors, - private val dateFormatter: DateFormatter, - private val loadMmsParts: LoadMmsParts) + private val dateFormatter: DateFormatter) : RealmRecyclerViewAdapter(null, true) { companion object { @@ -102,11 +100,6 @@ class MessagesAdapter @Inject constructor( return QkViewHolder(view) } - override fun onAttachedToRecyclerView(recyclerView: RecyclerView) { - super.onAttachedToRecyclerView(recyclerView) - disposables += loadMmsParts - } - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { super.onDetachedFromRecyclerView(recyclerView) disposables.clear() @@ -138,12 +131,6 @@ class MessagesAdapter @Inject constructor( private fun bindMmsPreview(view: View, position: Int) { val message = getItem(position)!! - - // If it's an MMS and the parts haven't been loaded, kick off a load - if (message.isMms() && message.parts.isEmpty()) { - loadMmsParts.execute(message.id) - } - view.mmsPreview.parts = message.parts }