From 0bb0f47fe9bb6a293ad32d69af36e918a67d2457 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 25 Sep 2017 16:17:44 -0400 Subject: [PATCH] Don't require Conversation model to be able to store Messages --- qksms/build.gradle | 1 + .../com/moez/QKSMS/dagger/AppComponent.kt | 4 +-- .../com/moez/QKSMS/data/model/Conversation.kt | 14 -------- .../data/repository/MessageRepository.kt | 23 ++++++++++--- .../com/moez/QKSMS/data/sync/SyncManager.kt | 24 ++++++------- .../ui/conversations/ConversationAdapter.kt | 34 ++++++++++++------- .../conversations/ConversationListActivity.kt | 4 ++- .../ConversationListViewModel.kt | 6 ++-- .../ConversationListViewState.kt | 6 ++-- .../moez/QKSMS/ui/messages/MessageAdapter.kt | 4 +-- .../QKSMS/ui/messages/MessageListActivity.kt | 4 +-- .../QKSMS/ui/messages/MessageListViewModel.kt | 2 +- .../util/extensions/ContextExtensions.kt | 8 +++++ .../res/layout/conversation_list_item.xml | 1 + .../main/res/layout/message_list_item_in.xml | 1 + .../main/res/layout/message_list_item_out.xml | 1 + 16 files changed, 79 insertions(+), 58 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/util/extensions/ContextExtensions.kt diff --git a/qksms/build.gradle b/qksms/build.gradle index e1f693fc..51ec3058 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -38,6 +38,7 @@ dependencies { compile "android.arch.lifecycle:runtime:1.0.0" compile 'com.android.support:appcompat-v7:26.1.0' 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.google.dagger:dagger:2.11" compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0' diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt index b5a6fba1..1713b0e9 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt @@ -1,7 +1,7 @@ package com.moez.QKSMS.dagger -import com.moez.QKSMS.data.model.Message 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.messages.MessageAdapter import com.moez.QKSMS.ui.messages.MessageListViewModel @@ -17,7 +17,7 @@ interface AppComponent { fun inject(viewModel: ConversationListViewModel) fun inject(viewModel: MessageListViewModel) - fun inject(message: Message) fun inject(adapter: MessageAdapter) + fun inject(adapter: ConversationAdapter) } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt index be333bab..84306cc5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt @@ -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 = RealmList() - var messages: RealmList = 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 = "" diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 00bec8fc..4480f3ed 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -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 { + fun getConversationMessagesAsync(): RealmResults { 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 { + return Realm.getDefaultInstance() + .where(Message::class.java) + .equalTo("threadId", threadId) + .findAllSorted("date") + } + fun getUnreadUnseenMessages(): RealmResults { return Realm.getDefaultInstance() .where(Message::class.java) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt index 947a5f68..2090ef04 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt @@ -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() } } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt index 4fc69a2c..882c71f3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt @@ -5,13 +5,24 @@ import android.content.Intent import android.view.LayoutInflater import android.view.ViewGroup 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.util.extensions.getColorCompat import io.realm.OrderedRealmCollection +import io.realm.RealmList import io.realm.RealmRecyclerViewAdapter +import javax.inject.Inject -class ConversationAdapter(val context: Context, data: OrderedRealmCollection?) : - RealmRecyclerViewAdapter(data, true) { +class ConversationAdapter(data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(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 { val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater @@ -19,18 +30,17 @@ class ConversationAdapter(val context: Context, data: OrderedRealmCollection = MutableLiveData() private val partialStates: PublishSubject = PublishSubject.create() - private val conversations: RealmResults + private val conversations: RealmResults init { AppComponentManager.appComponent.inject(this) @@ -31,7 +31,7 @@ class ConversationListViewModel : ViewModel() { .scan(ConversationListViewState(), { previous, changes -> changes.reduce(previous) }) .subscribe { newState -> state.value = newState } - conversations = messageRepo.getConversationsAsync() + conversations = messageRepo.getConversationMessagesAsync() partialStates.onNext(PartialState.ConversationsLoaded(conversations)) } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewState.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewState.kt index 9da92b7c..03d30faf 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewState.kt @@ -1,10 +1,10 @@ package com.moez.QKSMS.ui.conversations -import com.moez.QKSMS.data.model.Conversation +import com.moez.QKSMS.data.model.Message import io.realm.OrderedRealmCollection data class ConversationListViewState( - val conversations: OrderedRealmCollection? = null, + val conversations: OrderedRealmCollection? = null, val refreshing: Boolean = false ) @@ -12,7 +12,7 @@ sealed class PartialState { abstract fun reduce(previousState: ConversationListViewState): ConversationListViewState - data class ConversationsLoaded(val conversations: OrderedRealmCollection) : PartialState() { + data class ConversationsLoaded(val conversations: OrderedRealmCollection) : PartialState() { override fun reduce(previousState: ConversationListViewState): ConversationListViewState { return previousState.copy(conversations = conversations) } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt index 0bbca3ae..88183ae8 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt @@ -15,8 +15,7 @@ import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject -class MessageAdapter(val context: Context, data: OrderedRealmCollection?) : - RealmRecyclerViewAdapter(data, true) { +class MessageAdapter(data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(data, true) { companion object { private val TIMESTAMP_THRESHOLD = 60 @@ -25,6 +24,7 @@ class MessageAdapter(val context: Context, data: OrderedRealmCollection private val VIEWTYPE_OUT = 1 } + @Inject lateinit var context: Context @Inject lateinit var dateFormatter: DateFormatter init { diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt index 1177b71d..dcebb70d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt @@ -21,7 +21,7 @@ class MessageListActivity : QkActivity(), Observer { supportActionBar?.setDisplayHomeAsUpEnabled(true) 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) messageList.layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true } @@ -34,7 +34,7 @@ class MessageListActivity : QkActivity(), Observer { override fun onChanged(state: MessageListViewState?) { state?.let { 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 (state.hasError) finish() diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt index bab75f8b..7ef7cd37 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt @@ -37,7 +37,7 @@ class MessageListViewModel : ViewModel() { when (conversation.isValid) { true -> { val title = conversation.getTitle() - val messages = conversation.messages.sort("date") + val messages = messageRepo.getMessages(threadId) partialStates.onNext(PartialState.ConversationLoaded(title, messages)) } false -> partialStates.onNext(PartialState.ConversationError(true)) diff --git a/qksms/src/main/java/com/moez/QKSMS/util/extensions/ContextExtensions.kt b/qksms/src/main/java/com/moez/QKSMS/util/extensions/ContextExtensions.kt new file mode 100644 index 00000000..82f4162c --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/util/extensions/ContextExtensions.kt @@ -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) +} \ No newline at end of file diff --git a/qksms/src/main/res/layout/conversation_list_item.xml b/qksms/src/main/res/layout/conversation_list_item.xml index c41edd26..c28fa84a 100644 --- a/qksms/src/main/res/layout/conversation_list_item.xml +++ b/qksms/src/main/res/layout/conversation_list_item.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="?android:attr/selectableItemBackground" android:gravity="center_vertical" android:orientation="horizontal" android:paddingBottom="8dp" diff --git a/qksms/src/main/res/layout/message_list_item_in.xml b/qksms/src/main/res/layout/message_list_item_in.xml index 02be0f3f..cc2d290c 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="?android:attr/selectableItemBackground" android:orientation="vertical">