Use RealmAdapter for conversation info media

This commit is contained in:
Moez Bhatti
2018-04-05 05:21:07 -04:00
parent 8f2415afa2
commit 7a8aea0f38
8 changed files with 25 additions and 29 deletions
@@ -40,7 +40,6 @@ class CursorToPartImpl @Inject constructor(private val context: Context) : Curso
override fun map(from: Cursor) = MmsPart().apply {
id = from.getLong(from.getColumnIndexOrThrow(Telephony.Mms.Part._ID))
messageId = from.getLong(from.getColumnIndexOrThrow(Telephony.Mms.Part.MSG_ID))
// Type will sometimes return null, resulting in a crash if we don't default to an empty string
type = from.getString(from.getColumnIndexOrThrow(Telephony.Mms.Part.CONTENT_TYPE)) ?: ""
@@ -32,7 +32,6 @@ import com.klinker.android.send_message.BroadcastUtils
import com.klinker.android.send_message.StripAccents
import io.reactivex.Flowable
import io.reactivex.Maybe
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import io.realm.Realm
@@ -50,7 +49,6 @@ import util.MessageUtils
import util.Preferences
import util.extensions.asFlowable
import util.extensions.asMaybe
import util.extensions.asObservable
import util.extensions.insertOrUpdate
import util.extensions.map
import javax.inject.Inject
@@ -207,15 +205,14 @@ class MessageRepositoryImpl @Inject constructor(
.findFirst()
}
override fun getPartsForConversation(threadId: Long): Observable<List<MmsPart>> {
override fun getPartsForConversation(threadId: Long): RealmResults<MmsPart> {
return Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("threadId", threadId)
.isNotEmpty("parts")
.sort("date")
.findAll()
.asObservable()
.map { messages -> messages.flatMap { it.parts } }
.where(MmsPart::class.java)
.equalTo("messages.threadId", threadId)
.contains("type", "image/")
.isNotEmpty("image")
.sort("id", Sort.DESCENDING)
.findAllAsync()
}
/**
+5 -1
View File
@@ -19,15 +19,19 @@
package model
import io.realm.RealmObject
import io.realm.RealmResults
import io.realm.annotations.LinkingObjects
import io.realm.annotations.PrimaryKey
open class MmsPart : RealmObject() {
@PrimaryKey var id: Long = 0
var messageId: Long = 0
var type: String = ""
var text: String? = null
var image: String? = null
@LinkingObjects("parts")
val messages: RealmResults<Message>? = null
}
@@ -20,7 +20,6 @@ package repository
import io.reactivex.Flowable
import io.reactivex.Maybe
import io.reactivex.Observable
import io.realm.RealmResults
import model.Conversation
import model.Message
@@ -56,7 +55,7 @@ interface MessageRepository {
fun getPart(id: Long): MmsPart?
fun getPartsForConversation(threadId: Long): Observable<List<MmsPart>>
fun getPartsForConversation(threadId: Long): RealmResults<MmsPart>
/**
* Retrieves the list of messages which should be shown in the notification
@@ -94,7 +94,7 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
false -> R.string.info_block
})
mediaAdapter.data = state.media
mediaAdapter.updateData(state.media)
}
override fun showDeleteDialog() {
@@ -19,6 +19,7 @@
package feature.conversationinfo
import io.realm.RealmList
import io.realm.RealmResults
import model.MmsPart
import model.Recipient
@@ -27,6 +28,6 @@ data class ConversationInfoState(
val threadId: Long = 0,
val archived: Boolean = false,
val blocked: Boolean = false,
val media: List<MmsPart> = ArrayList(),
val media: RealmResults<MmsPart>? = null,
val hasError: Boolean = false
)
@@ -22,6 +22,8 @@ import android.content.Context
import android.content.Intent
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkViewModel
import injection.appComponent
import interactor.DeleteConversation
import interactor.MarkArchived
@@ -32,11 +34,8 @@ import io.reactivex.Observable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
import model.Conversation
import common.Navigator
import common.base.QkViewModel
import repository.MessageRepository
import util.extensions.asObservable
import util.extensions.isImage
import javax.inject.Inject
class ConversationInfoViewModel(intent: Intent) : QkViewModel<ConversationInfoView,
@@ -59,6 +58,9 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel<ConversationInfoVi
newState { it.copy(threadId = threadId) }
// Load the attachments from the conversation
newState { it.copy(media = messageRepo.getPartsForConversation(threadId)) }
conversation = messageRepo.getConversationAsync(threadId)
.asObservable<Conversation>()
.filter { conversation -> conversation.isLoaded }
@@ -93,12 +95,6 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel<ConversationInfoVi
.map { conversation -> conversation.blocked }
.distinctUntilChanged()
.subscribe { blocked -> newState { it.copy(blocked = blocked) } }
// Load the attachments from the conversation
disposables += messageRepo.getPartsForConversation(threadId)
.map { parts -> parts.filter { part -> part.isImage() } }
.map { parts -> parts.reversed() }
.subscribe { media -> newState { it.copy(media = media) } }
}
override fun bindView(view: ConversationInfoView) {
@@ -24,6 +24,8 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.moez.QKSMS.R
import common.base.QkRealmAdapter
import common.base.QkViewHolder
import common.util.Colors
import common.util.GlideApp
import io.reactivex.disposables.CompositeDisposable
@@ -31,14 +33,12 @@ import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.PublishSubject
import kotlinx.android.synthetic.main.conversation_media_list_item.view.*
import model.MmsPart
import common.base.QkAdapter
import common.base.QkViewHolder
import javax.inject.Inject
class ConversationMediaAdapter @Inject constructor(
private val context: Context,
private val colors: Colors
) : QkAdapter<MmsPart>() {
) : QkRealmAdapter<MmsPart>() {
val thumbnailClicks: PublishSubject<View> = PublishSubject.create()
@@ -53,7 +53,7 @@ class ConversationMediaAdapter @Inject constructor(
}
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
val part = getItem(position)
val part = getItem(position)!!
val view = holder.itemView
GlideApp.with(context)