Don't require Conversation model to be able to store Messages

This commit is contained in:
Moez Bhatti
2017-09-25 16:17:44 -04:00
parent 4c1ecc03c6
commit 0bb0f47fe9
16 changed files with 79 additions and 58 deletions
+1
View File
@@ -38,6 +38,7 @@ dependencies {
compile "android.arch.lifecycle:runtime:1.0.0" compile "android.arch.lifecycle:runtime:1.0.0"
compile 'com.android.support:appcompat-v7:26.1.0' compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.android.support:design:26.1.0'
compile 'com.bugsnag:bugsnag-android:3.9.0' compile 'com.bugsnag:bugsnag-android:3.9.0'
compile "com.google.dagger:dagger:2.11" compile "com.google.dagger:dagger:2.11"
compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0' compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
@@ -1,7 +1,7 @@
package com.moez.QKSMS.dagger package com.moez.QKSMS.dagger
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.receiver.SmsReceiver import com.moez.QKSMS.receiver.SmsReceiver
import com.moez.QKSMS.ui.conversations.ConversationAdapter
import com.moez.QKSMS.ui.conversations.ConversationListViewModel import com.moez.QKSMS.ui.conversations.ConversationListViewModel
import com.moez.QKSMS.ui.messages.MessageAdapter import com.moez.QKSMS.ui.messages.MessageAdapter
import com.moez.QKSMS.ui.messages.MessageListViewModel import com.moez.QKSMS.ui.messages.MessageListViewModel
@@ -17,7 +17,7 @@ interface AppComponent {
fun inject(viewModel: ConversationListViewModel) fun inject(viewModel: ConversationListViewModel)
fun inject(viewModel: MessageListViewModel) fun inject(viewModel: MessageListViewModel)
fun inject(message: Message)
fun inject(adapter: MessageAdapter) fun inject(adapter: MessageAdapter)
fun inject(adapter: ConversationAdapter)
} }
@@ -2,26 +2,12 @@ package com.moez.QKSMS.data.model
import io.realm.RealmList import io.realm.RealmList
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.Ignore
import io.realm.annotations.PrimaryKey import io.realm.annotations.PrimaryKey
open class Conversation : RealmObject() { open class Conversation : RealmObject() {
@PrimaryKey var id: Long = 0 @PrimaryKey var id: Long = 0
var contacts: RealmList<Contact> = RealmList() 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 { fun getTitle(): String {
var title = "" var title = ""
@@ -16,14 +16,15 @@ import com.moez.QKSMS.receiver.MessageSentReceiver
import com.moez.QKSMS.util.extensions.insertOrUpdate import com.moez.QKSMS.util.extensions.insertOrUpdate
import io.realm.Realm import io.realm.Realm
import io.realm.RealmResults import io.realm.RealmResults
import io.realm.Sort
class MessageRepository(val context: Context) { class MessageRepository(val context: Context) {
fun getConversationsAsync(): RealmResults<Conversation> { fun getConversationMessagesAsync(): RealmResults<Message> {
return Realm.getDefaultInstance() return Realm.getDefaultInstance()
.where(Conversation::class.java) .where(Message::class.java)
.isNotEmpty("messages") .distinctAsync("threadId")
.findAllAsync() .sort("date", Sort.DESCENDING)
} }
fun getConversationAsync(threadId: Long): Conversation { fun getConversationAsync(threadId: Long): Conversation {
@@ -33,6 +34,20 @@ class MessageRepository(val context: Context) {
.findFirstAsync() .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> { fun getUnreadUnseenMessages(): RealmResults<Message> {
return Realm.getDefaultInstance() return Realm.getDefaultInstance()
.where(Message::class.java) .where(Message::class.java)
@@ -12,8 +12,6 @@ import io.reactivex.Flowable
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import io.realm.Realm import io.realm.Realm
import timber.log.Timber
import java.util.*
class SyncManager(val context: Context, private val contactsRepo: ContactRepository) { 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) } .map { cursor -> conversationFromCursor(cursor) }
.distinct { conversation -> conversation.id } .distinct { conversation -> conversation.id }
.doOnNext { conversation -> realm?.insertOrUpdate(conversation) } .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() .count()
.toFlowable() .toFlowable()
.doOnNext { .doOnNext {
@@ -55,18 +63,6 @@ class SyncManager(val context: Context, private val contactsRepo: ContactReposit
.map { id -> contactsRepo.getContactBlocking(id) } .map { id -> contactsRepo.getContactBlocking(id) }
.filter { contact -> contact.recipientId != 0L } .filter { contact -> contact.recipientId != 0L }
.forEach { contact -> contacts.add(contact) } .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()
} }
} }
@@ -5,13 +5,24 @@ import android.content.Intent
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.ui.messages.MessageListActivity import com.moez.QKSMS.ui.messages.MessageListActivity
import com.moez.QKSMS.util.extensions.getColorCompat
import io.realm.OrderedRealmCollection import io.realm.OrderedRealmCollection
import io.realm.RealmList
import io.realm.RealmRecyclerViewAdapter import io.realm.RealmRecyclerViewAdapter
import javax.inject.Inject
class ConversationAdapter(val context: Context, data: OrderedRealmCollection<Conversation>?) : class ConversationAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, ConversationViewHolder>(data, true) {
RealmRecyclerViewAdapter<Conversation, ConversationViewHolder>(data, true) {
@Inject lateinit var context: Context
@Inject lateinit var messageRepo: MessageRepository
init {
AppComponentManager.appComponent.inject(this)
}
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ConversationViewHolder { override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ConversationViewHolder {
val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
@@ -19,18 +30,17 @@ class ConversationAdapter(val context: Context, data: OrderedRealmCollection<Con
} }
override fun onBindViewHolder(viewHolder: ConversationViewHolder, position: Int) { override fun onBindViewHolder(viewHolder: ConversationViewHolder, position: Int) {
val conversation = getItem(position)!! val message = getItem(position)!!
val conversation = messageRepo.getConversation(message.threadId)
viewHolder.itemView.setOnClickListener { viewHolder.itemView.setOnClickListener {
val intent = Intent(context, MessageListActivity::class.java) context.startActivity(Intent(context, MessageListActivity::class.java)
intent.putExtra("thread_id", conversation.id) .putExtra("threadId", message.threadId))
context.startActivity(intent)
} }
viewHolder.avatar.contacts = conversation.contacts viewHolder.avatar.contacts = conversation?.contacts ?: RealmList()
viewHolder.title.text = conversation.getTitle() viewHolder.title.text = conversation?.getTitle()
viewHolder.snippet.text = conversation.snippet viewHolder.snippet.text = message.body
viewHolder.snippet.setTextColor(context.resources.getColor(if (conversation.read) R.color.textTertiary else R.color.textPrimary)) viewHolder.snippet.setTextColor(context.getColorCompat(if (message.read) R.color.textTertiary else R.color.textPrimary))
} }
} }
@@ -34,7 +34,9 @@ class ConversationListActivity : QkActivity(), Observer<ConversationListViewStat
override fun onChanged(state: ConversationListViewState?) { override fun onChanged(state: ConversationListViewState?) {
state?.let { state?.let {
if (conversationList.adapter == null) conversationList.adapter = ConversationAdapter(this, state.conversations) if (conversationList.adapter == null && state.conversations?.isValid == true) {
conversationList.adapter = ConversationAdapter(state.conversations)
}
swipeRefresh.isRefreshing = state.refreshing swipeRefresh.isRefreshing = state.refreshing
} }
@@ -3,7 +3,7 @@ package com.moez.QKSMS.ui.conversations
import android.arch.lifecycle.MutableLiveData import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.ViewModel import android.arch.lifecycle.ViewModel
import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.data.sync.SyncManager import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.util.NotificationManager import com.moez.QKSMS.util.NotificationManager
@@ -20,7 +20,7 @@ class ConversationListViewModel : ViewModel() {
val state: MutableLiveData<ConversationListViewState> = MutableLiveData() val state: MutableLiveData<ConversationListViewState> = MutableLiveData()
private val partialStates: PublishSubject<PartialState> = PublishSubject.create() private val partialStates: PublishSubject<PartialState> = PublishSubject.create()
private val conversations: RealmResults<Conversation> private val conversations: RealmResults<Message>
init { init {
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
@@ -31,7 +31,7 @@ class ConversationListViewModel : ViewModel() {
.scan(ConversationListViewState(), { previous, changes -> changes.reduce(previous) }) .scan(ConversationListViewState(), { previous, changes -> changes.reduce(previous) })
.subscribe { newState -> state.value = newState } .subscribe { newState -> state.value = newState }
conversations = messageRepo.getConversationsAsync() conversations = messageRepo.getConversationMessagesAsync()
partialStates.onNext(PartialState.ConversationsLoaded(conversations)) partialStates.onNext(PartialState.ConversationsLoaded(conversations))
} }
@@ -1,10 +1,10 @@
package com.moez.QKSMS.ui.conversations package com.moez.QKSMS.ui.conversations
import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Message
import io.realm.OrderedRealmCollection import io.realm.OrderedRealmCollection
data class ConversationListViewState( data class ConversationListViewState(
val conversations: OrderedRealmCollection<Conversation>? = null, val conversations: OrderedRealmCollection<Message>? = null,
val refreshing: Boolean = false val refreshing: Boolean = false
) )
@@ -12,7 +12,7 @@ sealed class PartialState {
abstract fun reduce(previousState: ConversationListViewState): ConversationListViewState abstract fun reduce(previousState: ConversationListViewState): ConversationListViewState
data class ConversationsLoaded(val conversations: OrderedRealmCollection<Conversation>) : PartialState() { data class ConversationsLoaded(val conversations: OrderedRealmCollection<Message>) : PartialState() {
override fun reduce(previousState: ConversationListViewState): ConversationListViewState { override fun reduce(previousState: ConversationListViewState): ConversationListViewState {
return previousState.copy(conversations = conversations) return previousState.copy(conversations = conversations)
} }
@@ -15,8 +15,7 @@ import timber.log.Timber
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import javax.inject.Inject import javax.inject.Inject
class MessageAdapter(val context: Context, data: OrderedRealmCollection<Message>?) : class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, MessageViewHolder>(data, true) {
RealmRecyclerViewAdapter<Message, MessageViewHolder>(data, true) {
companion object { companion object {
private val TIMESTAMP_THRESHOLD = 60 private val TIMESTAMP_THRESHOLD = 60
@@ -25,6 +24,7 @@ class MessageAdapter(val context: Context, data: OrderedRealmCollection<Message>
private val VIEWTYPE_OUT = 1 private val VIEWTYPE_OUT = 1
} }
@Inject lateinit var context: Context
@Inject lateinit var dateFormatter: DateFormatter @Inject lateinit var dateFormatter: DateFormatter
init { init {
@@ -21,7 +21,7 @@ class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayHomeAsUpEnabled(true)
viewModel = ViewModelProviders.of(this)[MessageListViewModel::class.java] viewModel = ViewModelProviders.of(this)[MessageListViewModel::class.java]
viewModel.threadId = intent.getLongExtra("thread_id", 0) viewModel.threadId = intent.getLongExtra("threadId", 0)
viewModel.state.observe(this, this) viewModel.state.observe(this, this)
messageList.layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true } messageList.layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true }
@@ -34,7 +34,7 @@ class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
override fun onChanged(state: MessageListViewState?) { override fun onChanged(state: MessageListViewState?) {
state?.let { state?.let {
if (title != state.title) title = state.title if (title != state.title) title = state.title
if (messageList.adapter == null && state.messages?.isValid == true) messageList.adapter = MessageAdapter(this, state.messages) if (messageList.adapter == null && state.messages?.isValid == true) messageList.adapter = MessageAdapter(state.messages)
if (message.text.toString() != state.draft) message.setText(state.draft) if (message.text.toString() != state.draft) message.setText(state.draft)
if (state.hasError) finish() if (state.hasError) finish()
@@ -37,7 +37,7 @@ class MessageListViewModel : ViewModel() {
when (conversation.isValid) { when (conversation.isValid) {
true -> { true -> {
val title = conversation.getTitle() val title = conversation.getTitle()
val messages = conversation.messages.sort("date") val messages = messageRepo.getMessages(threadId)
partialStates.onNext(PartialState.ConversationLoaded(title, messages)) partialStates.onNext(PartialState.ConversationLoaded(title, messages))
} }
false -> partialStates.onNext(PartialState.ConversationError(true)) false -> partialStates.onNext(PartialState.ConversationError(true))
@@ -0,0 +1,8 @@
package com.moez.QKSMS.util.extensions
import android.content.Context
import android.support.v4.content.ContextCompat
fun Context.getColorCompat(colorRes: Int): Int {
return ContextCompat.getColor(this, colorRes)
}
@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="8dp" android:paddingBottom="8dp"
@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView