Move Message and Conversation queries to appropriate Repository

This commit is contained in:
Moez Bhatti
2017-09-22 11:35:49 -04:00
parent ba1b876ce7
commit f6063f9e37
6 changed files with 36 additions and 22 deletions
@@ -35,8 +35,8 @@ class AppModule(var application: Application) {
@Provides
@Singleton
fun provideNotificationHelper(context: Context): NotificationManager {
return NotificationManager(context)
fun provideNotificationHelper(context: Context, conversationRepository: ConversationRepository, messageRepository: MessageRepository): NotificationManager {
return NotificationManager(context, conversationRepository, messageRepository)
}
@Provides
@@ -3,18 +3,28 @@ 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 getConversation(threadId: Long): RealmResults<Conversation> {
fun getConversationAsync(threadId: Long): RealmResults<Conversation> {
return Realm.getDefaultInstance()
.where(Conversation::class.java)
.equalTo("id", threadId)
.findAllAsync()
}
fun getConversations(): RealmResults<Conversation> {
return Realm.getDefaultInstance().where(Conversation::class.java).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)
}
}
@@ -13,13 +13,22 @@ import io.realm.RealmResults
class MessageRepository(val context: Context) {
fun getMessages(threadId: Long): RealmResults<Message> {
fun getMessagesAsync(threadId: Long): RealmResults<Message> {
return Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("threadId", threadId)
.findAllSortedAsync("date")
}
fun getUnreadUnseenMessages(threadId: Long): RealmResults<Message> {
return Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("threadId", threadId)
.equalTo("seen", false)
.equalTo("read", false)
.findAllSorted("date")
}
fun insertMessage(address: String, body: String, time: Long) {
val cv = ContentValues()
@@ -31,7 +31,7 @@ class ConversationListViewModel : ViewModel() {
.scan(ConversationListViewState(), { previous, changes -> changes.reduce(previous) })
.subscribe { newState -> state.value = newState }
conversations = conversationRepo.getConversations()
conversations = conversationRepo.getConversationsAsync()
partialStates.onNext(PartialState.ConversationsLoaded(conversations))
}
@@ -36,11 +36,11 @@ class MessageListViewModel : ViewModel() {
}
private fun newThreadId() {
messages = messageRepo.getMessages(threadId)
messages = messageRepo.getMessagesAsync(threadId)
messages?.let { partialStates.onNext(PartialState.MessagesLoaded(it)) }
conversation?.removeAllChangeListeners()
conversation = conversationRepo.getConversation(threadId)
conversation = conversationRepo.getConversationAsync(threadId)
conversation?.addChangeListener { realmResults ->
when (realmResults.size) {
0 -> partialStates.onNext(PartialState.ConversationError(true))
@@ -8,12 +8,12 @@ import android.os.Build
import android.support.v4.app.NotificationCompat
import android.support.v4.app.NotificationManagerCompat
import com.moez.QKSMS.R
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.ConversationRepository
import com.moez.QKSMS.data.repository.MessageRepository
import io.realm.Realm
class NotificationManager(val context: Context) {
class NotificationManager(val context: Context, val conversationRepo: ConversationRepository, val messageRepo: MessageRepository) {
private val notificationManager = NotificationManagerCompat.from(context)
@@ -41,17 +41,12 @@ class NotificationManager(val context: Context) {
fun update() {
val realm = Realm.getDefaultInstance()
realm.where(Conversation::class.java).equalTo("read", false).findAllSorted("date").forEach { conversation ->
conversationRepo.getUnreadConversations().forEach { conversation ->
val style = NotificationCompat.MessagingStyle("Me")
realm.where(Message::class.java)
.equalTo("threadId", conversation.id)
.equalTo("seen", false)
.equalTo("read", false)
.findAllSorted("date")
.forEach { message ->
val name = if (message.isMe()) null else conversation.getTitle()
style.addMessage(message.body, message.date, name)
}
messageRepo.getUnreadUnseenMessages(conversation.id).forEach { message ->
val name = if (message.isMe()) null else conversation.getTitle()
style.addMessage(message.body, message.date, name)
}
val notification = NotificationCompat.Builder(context, "channel_1")
.setColor(context.resources.getColor(R.color.colorPrimary))