From 6206b70ec34e512909cf886a13de7f4cb0f71527 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 22 Sep 2017 19:58:45 -0400 Subject: [PATCH] Correctly sort messages in MessageList --- .../java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt | 6 +++++- .../java/com/moez/QKSMS/ui/messages/MessageListViewState.kt | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) 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 2ebdb657..bab75f8b 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 @@ -35,7 +35,11 @@ class MessageListViewModel : ViewModel() { conversation = messageRepo.getConversationAsync(threadId) conversation?.addChangeListener { conversation: Conversation -> when (conversation.isValid) { - true -> partialStates.onNext(PartialState.ConversationLoaded(conversation)) + true -> { + val title = conversation.getTitle() + val messages = conversation.messages.sort("date") + partialStates.onNext(PartialState.ConversationLoaded(title, messages)) + } false -> partialStates.onNext(PartialState.ConversationError(true)) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt index 37308f95..f02aca7f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt @@ -1,8 +1,8 @@ package com.moez.QKSMS.ui.messages -import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Message import io.realm.OrderedRealmCollection +import io.realm.RealmResults data class MessageListViewState( val title: String = "", @@ -17,9 +17,9 @@ sealed class PartialState { abstract fun reduce(previousState: MessageListViewState): MessageListViewState - data class ConversationLoaded(private val conversation: Conversation) : PartialState() { + data class ConversationLoaded(private val title: String, private val messages: RealmResults) : PartialState() { override fun reduce(previousState: MessageListViewState): MessageListViewState { - return previousState.copy(title = conversation.getTitle(), messages = conversation.messages) + return previousState.copy(title = title, messages = messages) } }