mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-18 03:48:52 +01:00
Revamped data structure, use delegated properties for Conversation
This commit is contained in:
@@ -1,45 +1,27 @@
|
||||
package com.moez.QKSMS.data.model
|
||||
|
||||
import android.database.Cursor
|
||||
import com.moez.QKSMS.data.repository.ContactRepository
|
||||
import com.moez.QKSMS.data.sync.ConversationColumns
|
||||
import io.reactivex.Flowable
|
||||
import io.realm.RealmList
|
||||
import io.realm.RealmObject
|
||||
import io.realm.annotations.Ignore
|
||||
import io.realm.annotations.PrimaryKey
|
||||
|
||||
open class Conversation() : RealmObject() {
|
||||
open class Conversation : RealmObject() {
|
||||
|
||||
@PrimaryKey var id: Long = 0
|
||||
var date: Long = 0
|
||||
var messageCount: Int = 0
|
||||
var contacts: RealmList<Contact> = RealmList()
|
||||
var snippet: String = ""
|
||||
var snippetCs: String = ""
|
||||
var read: Boolean = true
|
||||
var error: Int = 0
|
||||
var hasAttachment: Int = 0
|
||||
var messages: RealmList<Message> = RealmList()
|
||||
|
||||
/**
|
||||
* Instantiates a Conversation from the Android SMS ContentProvider
|
||||
*/
|
||||
constructor(cursor: Cursor, contacts: ContactRepository) : this() {
|
||||
id = cursor.getLong(ConversationColumns.ID)
|
||||
date = cursor.getLong(ConversationColumns.DATE)
|
||||
messageCount = cursor.getInt(ConversationColumns.MESSAGE_COUNT)
|
||||
@Ignore var date: Long = 0
|
||||
get() = lastMessage?.date ?: 0
|
||||
|
||||
Flowable.fromIterable(cursor.getString(ConversationColumns.RECIPIENT_IDS).split(" "))
|
||||
.map { id -> id.toLong() }
|
||||
.map { id -> contacts.getContactBlocking(id) }
|
||||
.filter { contact -> contact.recipientId != 0L }
|
||||
.blockingSubscribe { contact -> this.contacts.add(contact) }
|
||||
@Ignore var read: Boolean = true
|
||||
get() = lastMessage?.read ?: true
|
||||
|
||||
snippet = cursor.getString(ConversationColumns.SNIPPET) ?: ""
|
||||
snippetCs = cursor.getString(ConversationColumns.SNIPPET_CS) ?: ""
|
||||
read = cursor.getInt(ConversationColumns.READ) != 0
|
||||
error = cursor.getInt(ConversationColumns.ERROR)
|
||||
hasAttachment = cursor.getInt(ConversationColumns.HAS_ATTACHMENT)
|
||||
}
|
||||
@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 = ""
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
package com.moez.QKSMS.data.model
|
||||
|
||||
import android.database.Cursor
|
||||
import android.provider.Telephony
|
||||
import android.provider.Telephony.Mms
|
||||
import android.provider.Telephony.Sms
|
||||
import com.moez.QKSMS.data.sync.MessageColumns
|
||||
import io.realm.RealmObject
|
||||
import io.realm.annotations.PrimaryKey
|
||||
|
||||
open class Message() : RealmObject() {
|
||||
open class Message : RealmObject() {
|
||||
|
||||
@PrimaryKey var id: Long = 0
|
||||
var threadId: Long = 0
|
||||
@@ -21,31 +19,6 @@ open class Message() : RealmObject() {
|
||||
var read: Boolean = false
|
||||
var errorType: Int = 0
|
||||
|
||||
constructor(threadId: Long, cursor: Cursor, columnsMap: MessageColumns) : this() {
|
||||
this.threadId = threadId
|
||||
|
||||
id = cursor.getLong(columnsMap.msgId)
|
||||
type = cursor.getString(columnsMap.msgType)
|
||||
|
||||
val isMms = type == "mms"
|
||||
body = cursor.getString(columnsMap.smsBody) ?: ""
|
||||
errorType = cursor.getInt(columnsMap.mmsErrorType)
|
||||
|
||||
if (isMms) {
|
||||
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
|
||||
} else {
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
fun isMms(): Boolean = type == "mms"
|
||||
|
||||
fun isSms(): Boolean = type == "sms"
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
package com.moez.QKSMS.data.repository
|
||||
|
||||
import com.moez.QKSMS.data.model.Conversation
|
||||
import io.realm.Realm
|
||||
import io.realm.RealmResults
|
||||
import io.realm.Sort
|
||||
|
||||
class ConversationRepository {
|
||||
|
||||
fun getConversationAsync(threadId: Long): RealmResults<Conversation> {
|
||||
return Realm.getDefaultInstance()
|
||||
.where(Conversation::class.java)
|
||||
.equalTo("id", threadId)
|
||||
.findAllAsync()
|
||||
}
|
||||
|
||||
fun getConversationsAsync(): RealmResults<Conversation> {
|
||||
return Realm.getDefaultInstance()
|
||||
.where(Conversation::class.java)
|
||||
.findAllSortedAsync("date", Sort.DESCENDING)
|
||||
}
|
||||
|
||||
fun getUnreadConversations(): RealmResults<Conversation> {
|
||||
return Realm.getDefaultInstance()
|
||||
.where(Conversation::class.java)
|
||||
.equalTo("read", false)
|
||||
.findAllSorted("date", Sort.DESCENDING)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -6,24 +6,31 @@ import android.content.Context
|
||||
import android.net.Uri
|
||||
import android.provider.Telephony
|
||||
import android.telephony.SmsManager
|
||||
import com.moez.QKSMS.data.model.Conversation
|
||||
import com.moez.QKSMS.data.model.Message
|
||||
import com.moez.QKSMS.data.sync.MessageColumns
|
||||
import com.moez.QKSMS.data.sync.SyncManager
|
||||
import io.realm.Realm
|
||||
import io.realm.RealmResults
|
||||
|
||||
class MessageRepository(val context: Context) {
|
||||
|
||||
fun getMessagesAsync(threadId: Long): RealmResults<Message> {
|
||||
fun getConversationsAsync(): RealmResults<Conversation> {
|
||||
return Realm.getDefaultInstance()
|
||||
.where(Message::class.java)
|
||||
.equalTo("threadId", threadId)
|
||||
.findAllSortedAsync("date")
|
||||
.where(Conversation::class.java)
|
||||
.findAllAsync()
|
||||
}
|
||||
|
||||
fun getUnreadUnseenMessages(threadId: Long): RealmResults<Message> {
|
||||
fun getConversationAsync(threadId: Long): Conversation {
|
||||
return Realm.getDefaultInstance()
|
||||
.where(Conversation::class.java)
|
||||
.equalTo("id", threadId)
|
||||
.findFirstAsync()
|
||||
}
|
||||
|
||||
fun getUnreadUnseenMessages(): RealmResults<Message> {
|
||||
return Realm.getDefaultInstance()
|
||||
.where(Message::class.java)
|
||||
.equalTo("threadId", threadId)
|
||||
.equalTo("seen", false)
|
||||
.equalTo("read", false)
|
||||
.findAllSorted("date")
|
||||
@@ -71,7 +78,7 @@ class MessageRepository(val context: Context) {
|
||||
|
||||
if (messageCursor.moveToFirst()) {
|
||||
val columns = MessageColumns(messageCursor)
|
||||
val message = Message(threadId, messageCursor, columns)
|
||||
val message = SyncManager.messageFromCursor(threadId, messageCursor, columns)
|
||||
val realm = Realm.getDefaultInstance()
|
||||
realm.executeTransaction { it.insertOrUpdate(message) }
|
||||
realm.close()
|
||||
|
||||
@@ -7,22 +7,8 @@ internal object ConversationColumns {
|
||||
val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true")
|
||||
val PROJECTION = arrayOf(
|
||||
android.provider.Telephony.Threads._ID,
|
||||
android.provider.Telephony.Threads.DATE,
|
||||
android.provider.Telephony.Threads.MESSAGE_COUNT,
|
||||
android.provider.Telephony.Threads.RECIPIENT_IDS,
|
||||
android.provider.Telephony.Threads.SNIPPET,
|
||||
android.provider.Telephony.Threads.SNIPPET_CHARSET,
|
||||
android.provider.Telephony.Threads.READ,
|
||||
android.provider.Telephony.Threads.ERROR,
|
||||
android.provider.Telephony.Threads.HAS_ATTACHMENT)
|
||||
android.provider.Telephony.Threads.RECIPIENT_IDS)
|
||||
|
||||
val ID = 0
|
||||
val DATE = 1
|
||||
val MESSAGE_COUNT = 2
|
||||
val RECIPIENT_IDS = 3
|
||||
val SNIPPET = 4
|
||||
val SNIPPET_CS = 5
|
||||
val READ = 6
|
||||
val ERROR = 7
|
||||
val HAS_ATTACHMENT = 8
|
||||
val RECIPIENT_IDS = 1
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.moez.QKSMS.data.sync
|
||||
|
||||
import android.content.Context
|
||||
import android.database.Cursor
|
||||
import android.net.Uri
|
||||
import com.moez.QKSMS.data.model.Conversation
|
||||
import com.moez.QKSMS.data.model.Message
|
||||
@@ -11,8 +12,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import io.realm.Realm
|
||||
|
||||
class SyncManager(val context: Context, val contacts: ContactRepository) {
|
||||
private val TAG = "SyncManager"
|
||||
class SyncManager(val context: Context, private val contactsRepo: ContactRepository) {
|
||||
|
||||
fun copyToRealm(completionListener: () -> Unit) {
|
||||
|
||||
@@ -30,19 +30,9 @@ class SyncManager(val context: Context, val contacts: ContactRepository) {
|
||||
realm?.deleteAll()
|
||||
}
|
||||
.flatMap { cursor -> cursor.asFlowable() }
|
||||
.map { cursor -> Conversation(cursor, contacts) }
|
||||
.map { cursor -> conversationFromCursor(cursor) }
|
||||
.distinct { conversation -> conversation.id }
|
||||
.doOnNext { conversation -> realm?.insertOrUpdate(conversation) }
|
||||
.map { conversation -> conversation.id }
|
||||
.concatMap { 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 -> Message(threadId, cursor, columnsMap) }
|
||||
}
|
||||
.filter { message -> message.type == "sms" || message.type == "mms" }
|
||||
.distinct { message -> message.id }
|
||||
.doOnNext { message -> realm?.insertOrUpdate(message) }
|
||||
.count()
|
||||
.toFlowable()
|
||||
.doOnNext {
|
||||
@@ -53,4 +43,56 @@ class SyncManager(val context: Context, val contacts: ContactRepository) {
|
||||
.subscribe { completionListener.invoke() }
|
||||
}
|
||||
|
||||
private fun conversationFromCursor(cursor: Cursor): Conversation {
|
||||
return Conversation().apply {
|
||||
id = cursor.getLong(ConversationColumns.ID)
|
||||
|
||||
cursor.getString(ConversationColumns.RECIPIENT_IDS).split(" ")
|
||||
.map { id -> id.toLong() }
|
||||
.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)
|
||||
messagesCursor.asFlowable()
|
||||
.map { cursor -> messageFromCursor(id, cursor, columnsMap) }
|
||||
.filter { message -> message.type == "sms" || message.type == "mms" }
|
||||
.distinct { message -> message.id }
|
||||
.doOnNext { message -> messages.add(message) }
|
||||
.blockingSubscribe()
|
||||
}
|
||||
}
|
||||
|
||||
// TODO take this out of the companion object
|
||||
companion object {
|
||||
fun messageFromCursor(threadId: Long, cursor: Cursor, columnsMap: MessageColumns): Message {
|
||||
return Message().apply {
|
||||
this.threadId = threadId
|
||||
|
||||
id = cursor.getLong(columnsMap.msgId)
|
||||
type = cursor.getString(columnsMap.msgType)
|
||||
|
||||
val isMms = type == "mms"
|
||||
body = cursor.getString(columnsMap.smsBody) ?: ""
|
||||
errorType = cursor.getInt(columnsMap.mmsErrorType)
|
||||
|
||||
if (isMms) {
|
||||
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
|
||||
} else {
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user