Store lastMessage instead of it's fields in conversation

This commit is contained in:
moezbhatti
2019-11-09 03:43:15 -05:00
parent e720ee9560
commit 335c5757c4
11 changed files with 74 additions and 71 deletions
@@ -36,33 +36,21 @@ class CursorToConversationImpl @Inject constructor(
val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true")
val PROJECTION = arrayOf(
Threads._ID,
Threads.DATE,
Threads.RECIPIENT_IDS,
Threads.MESSAGE_COUNT,
Threads.READ,
Threads.SNIPPET
Threads.RECIPIENT_IDS
)
const val ID = 0
const val DATE = 1
const val RECIPIENT_IDS = 2
const val MESSAGE_COUNT = 3
const val READ = 4
const val SNIPPET = 5
const val RECIPIENT_IDS = 1
}
override fun map(from: Cursor): Conversation {
return Conversation().apply {
id = from.getLong(ID)
date = from.getLong(DATE)
recipients.addAll(from.getString(RECIPIENT_IDS)
.split(" ")
.filter { it.isNotBlank() }
.map { recipientId -> recipientId.toLong() }
.map { recipientId -> Recipient().apply { id = recipientId } })
count = from.getInt(MESSAGE_COUNT)
read = from.getInt(READ) == 1
snippet = from.getString(SNIPPET) ?: ""
}
}
@@ -25,7 +25,7 @@ import io.realm.RealmMigration
class QkRealmMigration : RealmMigration {
companion object {
const val SCHEMA_VERSION: Long = 7
const val SCHEMA_VERSION: Long = 8
}
override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
@@ -92,9 +92,19 @@ class QkRealmMigration : RealmMigration {
version++
}
if (version < newVersion) {
throw IllegalStateException("Migration missing from v$oldVersion to v$newVersion")
if (version == 7L) {
realm.schema.get("Conversation")
?.addRealmObjectField("lastMessage", realm.schema.get("Message"))
?.removeField("count")
?.removeField("date")
?.removeField("snippet")
?.removeField("read")
?.removeField("me")
version++
}
check(version >= newVersion) { "Migration missing from v$oldVersion to v$newVersion" }
}
}
@@ -54,11 +54,11 @@ class ConversationRepositoryImpl @Inject constructor(
return Realm.getDefaultInstance()
.where(Conversation::class.java)
.notEqualTo("id", 0L)
.greaterThan("count", 0)
.isNotNull("lastMessage")
.equalTo("archived", archived)
.equalTo("blocked", false)
.isNotEmpty("recipients")
.sort("pinned", Sort.DESCENDING, "date", Sort.DESCENDING)
.sort("pinned", Sort.DESCENDING, "lastMessage.date", Sort.DESCENDING)
.findAllAsync()
}
@@ -67,28 +67,37 @@ class ConversationRepositoryImpl @Inject constructor(
realm.refresh()
realm.copyFromRealm(realm.where(Conversation::class.java)
.notEqualTo("id", 0L)
.greaterThan("count", 0)
.isNotNull("lastMessage")
.equalTo("archived", false)
.equalTo("blocked", false)
.isNotEmpty("recipients")
.sort("pinned", Sort.DESCENDING, "date", Sort.DESCENDING)
.sort("pinned", Sort.DESCENDING, "lastMessage.date", Sort.DESCENDING)
.findAll())
}
}
override fun getTopConversations(): List<Conversation> {
val realm = Realm.getDefaultInstance()
return realm.copyFromRealm(
realm.where(Conversation::class.java)
.notEqualTo("id", 0L)
.greaterThan("count", 0)
.greaterThan("date", System.currentTimeMillis() - TimeUnit.DAYS.toMillis(7))
.equalTo("archived", false)
.equalTo("blocked", false)
.isNotEmpty("recipients")
.sort("pinned", Sort.DESCENDING, "count", Sort.DESCENDING)
.findAll()
)
return Realm.getDefaultInstance().use { realm ->
realm.copyFromRealm(realm.where(Conversation::class.java)
.notEqualTo("id", 0L)
.isNotNull("lastMessage")
.beginGroup()
.equalTo("pinned", true)
.or()
.greaterThan("lastMessage.date", System.currentTimeMillis() - TimeUnit.DAYS.toMillis(7))
.endGroup()
.equalTo("archived", false)
.equalTo("blocked", false)
.isNotEmpty("recipients")
.findAll())
.sortedWith(compareByDescending<Conversation> { conversation -> conversation.pinned }
.thenByDescending { conversation ->
realm.where(Message::class.java)
.equalTo("threadId", conversation.id)
.greaterThan("date", System.currentTimeMillis() - TimeUnit.DAYS.toMillis(7))
.count()
})
}
}
override fun setConversationName(id: Long, name: String) {
@@ -234,20 +243,14 @@ class ConversationRepositoryImpl @Inject constructor(
.equalTo("id", threadId)
.findFirst() ?: return
val messages = realm
val message = realm
.where(Message::class.java)
.equalTo("threadId", threadId)
.sort("date", Sort.DESCENDING)
.findAll()
val message = messages.firstOrNull()
.findFirst()
realm.executeTransaction {
conversation.count = messages.size
conversation.date = message?.date ?: 0
conversation.snippet = message?.getSummary() ?: ""
conversation.read = message?.read ?: true
conversation.me = message?.isMe() ?: false
conversation.lastMessage = message
}
}
}
@@ -113,7 +113,7 @@ class MessageRepositoryImpl @Inject constructor(
realm.where(Conversation::class.java)
.equalTo("archived", false)
.equalTo("blocked", false)
.equalTo("read", false)
.equalTo("lastMessage.read", false)
.count()
}
}
@@ -251,13 +251,15 @@ class MessageRepositoryImpl @Inject constructor(
override fun markUnread(vararg threadIds: Long) {
Realm.getDefaultInstance()?.use { realm ->
val conversation = realm.where(Conversation::class.java)
val conversations = realm.where(Conversation::class.java)
.anyOf("id", threadIds)
.equalTo("read", true)
.equalTo("lastMessage.read", true)
.findAll()
realm.executeTransaction {
conversation.forEach { it.read = false }
conversations.forEach { conversation ->
conversation.lastMessage?.read = false
}
}
}
}
@@ -147,9 +147,7 @@ class SyncRepositoryImpl @Inject constructor(
.findAll()
.forEach { message ->
val conversation = conversations.find { conversation -> conversation.id == message.threadId }
conversation?.date = message.date
conversation?.snippet = message.getSummary()
conversation?.me = message.isMe()
conversation?.lastMessage = message
}
realm.insertOrUpdate(conversations)