forked from upstream-mirrors/quik
Don't require Conversation model to be able to store Messages
This commit is contained in:
@@ -2,26 +2,12 @@ package com.moez.QKSMS.data.model
|
||||
|
||||
import io.realm.RealmList
|
||||
import io.realm.RealmObject
|
||||
import io.realm.annotations.Ignore
|
||||
import io.realm.annotations.PrimaryKey
|
||||
|
||||
open class Conversation : RealmObject() {
|
||||
|
||||
@PrimaryKey var id: Long = 0
|
||||
var contacts: RealmList<Contact> = RealmList()
|
||||
var messages: RealmList<Message> = RealmList()
|
||||
|
||||
@Ignore var date: Long = 0
|
||||
get() = lastMessage?.date ?: 0
|
||||
|
||||
@Ignore var read: Boolean = true
|
||||
get() = lastMessage?.read ?: true
|
||||
|
||||
@Ignore var snippet: String = ""
|
||||
get () = lastMessage?.body ?: ""
|
||||
|
||||
@Ignore private var lastMessage: Message? = null
|
||||
get () = if (messages.size == 0) null else messages[0]
|
||||
|
||||
fun getTitle(): String {
|
||||
var title = ""
|
||||
|
||||
@@ -16,14 +16,15 @@ import com.moez.QKSMS.receiver.MessageSentReceiver
|
||||
import com.moez.QKSMS.util.extensions.insertOrUpdate
|
||||
import io.realm.Realm
|
||||
import io.realm.RealmResults
|
||||
import io.realm.Sort
|
||||
|
||||
class MessageRepository(val context: Context) {
|
||||
|
||||
fun getConversationsAsync(): RealmResults<Conversation> {
|
||||
fun getConversationMessagesAsync(): RealmResults<Message> {
|
||||
return Realm.getDefaultInstance()
|
||||
.where(Conversation::class.java)
|
||||
.isNotEmpty("messages")
|
||||
.findAllAsync()
|
||||
.where(Message::class.java)
|
||||
.distinctAsync("threadId")
|
||||
.sort("date", Sort.DESCENDING)
|
||||
}
|
||||
|
||||
fun getConversationAsync(threadId: Long): Conversation {
|
||||
@@ -33,6 +34,20 @@ class MessageRepository(val context: Context) {
|
||||
.findFirstAsync()
|
||||
}
|
||||
|
||||
fun getConversation(threadId: Long): Conversation? {
|
||||
return Realm.getDefaultInstance()
|
||||
.where(Conversation::class.java)
|
||||
.equalTo("id", threadId)
|
||||
.findFirst()
|
||||
}
|
||||
|
||||
fun getMessages(threadId: Long): RealmResults<Message> {
|
||||
return Realm.getDefaultInstance()
|
||||
.where(Message::class.java)
|
||||
.equalTo("threadId", threadId)
|
||||
.findAllSorted("date")
|
||||
}
|
||||
|
||||
fun getUnreadUnseenMessages(): RealmResults<Message> {
|
||||
return Realm.getDefaultInstance()
|
||||
.where(Message::class.java)
|
||||
|
||||
@@ -12,8 +12,6 @@ import io.reactivex.Flowable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import io.realm.Realm
|
||||
import timber.log.Timber
|
||||
import java.util.*
|
||||
|
||||
class SyncManager(val context: Context, private val contactsRepo: ContactRepository) {
|
||||
|
||||
@@ -36,6 +34,16 @@ class SyncManager(val context: Context, private val contactsRepo: ContactReposit
|
||||
.map { cursor -> conversationFromCursor(cursor) }
|
||||
.distinct { conversation -> conversation.id }
|
||||
.doOnNext { conversation -> realm?.insertOrUpdate(conversation) }
|
||||
.map { conversation -> conversation.id }
|
||||
.flatMap { threadId ->
|
||||
val uri = Uri.withAppendedPath(MessageColumns.URI, threadId.toString())
|
||||
val messagesCursor = contentResolver.query(uri, MessageColumns.PROJECTION, null, null, "date desc")
|
||||
val columnsMap = MessageColumns(messagesCursor)
|
||||
messagesCursor.asFlowable().map { cursor -> messageFromCursor(cursor, columnsMap) }
|
||||
}
|
||||
.filter { message -> message.type == "sms" || message.type == "mms" }
|
||||
.distinct { message -> message.id }
|
||||
.doOnNext { message -> realm?.insertOrUpdate(message) }
|
||||
.count()
|
||||
.toFlowable()
|
||||
.doOnNext {
|
||||
@@ -55,18 +63,6 @@ class SyncManager(val context: Context, private val contactsRepo: ContactReposit
|
||||
.map { id -> contactsRepo.getContactBlocking(id) }
|
||||
.filter { contact -> contact.recipientId != 0L }
|
||||
.forEach { contact -> contacts.add(contact) }
|
||||
|
||||
val contentResolver = context.contentResolver
|
||||
val uri = Uri.withAppendedPath(MessageColumns.URI, id.toString())
|
||||
val messagesCursor = contentResolver.query(uri, MessageColumns.PROJECTION, null, null, "date desc")
|
||||
val columnsMap = MessageColumns(messagesCursor)
|
||||
Timber.d("Columns: ${Arrays.toString(messagesCursor.columnNames)}")
|
||||
messagesCursor.asFlowable()
|
||||
.map { cursor -> messageFromCursor(cursor, columnsMap) }
|
||||
.filter { message -> message.type == "sms" || message.type == "mms" }
|
||||
.distinct { message -> message.id }
|
||||
.doOnNext { message -> messages.add(message) }
|
||||
.blockingSubscribe()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user