forked from upstream-mirrors/quik
Move Message and Conversation queries to appropriate Repository
This commit is contained in:
@@ -35,8 +35,8 @@ class AppModule(var application: Application) {
|
|||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
@Singleton
|
@Singleton
|
||||||
fun provideNotificationHelper(context: Context): NotificationManager {
|
fun provideNotificationHelper(context: Context, conversationRepository: ConversationRepository, messageRepository: MessageRepository): NotificationManager {
|
||||||
return NotificationManager(context)
|
return NotificationManager(context, conversationRepository, messageRepository)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
|
|||||||
@@ -3,18 +3,28 @@ package com.moez.QKSMS.data.repository
|
|||||||
import com.moez.QKSMS.data.model.Conversation
|
import com.moez.QKSMS.data.model.Conversation
|
||||||
import io.realm.Realm
|
import io.realm.Realm
|
||||||
import io.realm.RealmResults
|
import io.realm.RealmResults
|
||||||
|
import io.realm.Sort
|
||||||
|
|
||||||
class ConversationRepository {
|
class ConversationRepository {
|
||||||
|
|
||||||
fun getConversation(threadId: Long): RealmResults<Conversation> {
|
fun getConversationAsync(threadId: Long): RealmResults<Conversation> {
|
||||||
return Realm.getDefaultInstance()
|
return Realm.getDefaultInstance()
|
||||||
.where(Conversation::class.java)
|
.where(Conversation::class.java)
|
||||||
.equalTo("id", threadId)
|
.equalTo("id", threadId)
|
||||||
.findAllAsync()
|
.findAllAsync()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getConversations(): RealmResults<Conversation> {
|
fun getConversationsAsync(): RealmResults<Conversation> {
|
||||||
return Realm.getDefaultInstance().where(Conversation::class.java).findAllAsync()
|
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) {
|
class MessageRepository(val context: Context) {
|
||||||
|
|
||||||
fun getMessages(threadId: Long): RealmResults<Message> {
|
fun getMessagesAsync(threadId: Long): RealmResults<Message> {
|
||||||
return Realm.getDefaultInstance()
|
return Realm.getDefaultInstance()
|
||||||
.where(Message::class.java)
|
.where(Message::class.java)
|
||||||
.equalTo("threadId", threadId)
|
.equalTo("threadId", threadId)
|
||||||
.findAllSortedAsync("date")
|
.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) {
|
fun insertMessage(address: String, body: String, time: Long) {
|
||||||
val cv = ContentValues()
|
val cv = ContentValues()
|
||||||
|
|
||||||
|
|||||||
@@ -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 = conversationRepo.getConversations()
|
conversations = conversationRepo.getConversationsAsync()
|
||||||
partialStates.onNext(PartialState.ConversationsLoaded(conversations))
|
partialStates.onNext(PartialState.ConversationsLoaded(conversations))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,11 +36,11 @@ class MessageListViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun newThreadId() {
|
private fun newThreadId() {
|
||||||
messages = messageRepo.getMessages(threadId)
|
messages = messageRepo.getMessagesAsync(threadId)
|
||||||
messages?.let { partialStates.onNext(PartialState.MessagesLoaded(it)) }
|
messages?.let { partialStates.onNext(PartialState.MessagesLoaded(it)) }
|
||||||
|
|
||||||
conversation?.removeAllChangeListeners()
|
conversation?.removeAllChangeListeners()
|
||||||
conversation = conversationRepo.getConversation(threadId)
|
conversation = conversationRepo.getConversationAsync(threadId)
|
||||||
conversation?.addChangeListener { realmResults ->
|
conversation?.addChangeListener { realmResults ->
|
||||||
when (realmResults.size) {
|
when (realmResults.size) {
|
||||||
0 -> partialStates.onNext(PartialState.ConversationError(true))
|
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.NotificationCompat
|
||||||
import android.support.v4.app.NotificationManagerCompat
|
import android.support.v4.app.NotificationManagerCompat
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.data.model.Conversation
|
import com.moez.QKSMS.data.repository.ConversationRepository
|
||||||
import com.moez.QKSMS.data.model.Message
|
import com.moez.QKSMS.data.repository.MessageRepository
|
||||||
import io.realm.Realm
|
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)
|
private val notificationManager = NotificationManagerCompat.from(context)
|
||||||
|
|
||||||
@@ -41,17 +41,12 @@ class NotificationManager(val context: Context) {
|
|||||||
fun update() {
|
fun update() {
|
||||||
val realm = Realm.getDefaultInstance()
|
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")
|
val style = NotificationCompat.MessagingStyle("Me")
|
||||||
realm.where(Message::class.java)
|
messageRepo.getUnreadUnseenMessages(conversation.id).forEach { message ->
|
||||||
.equalTo("threadId", conversation.id)
|
val name = if (message.isMe()) null else conversation.getTitle()
|
||||||
.equalTo("seen", false)
|
style.addMessage(message.body, message.date, name)
|
||||||
.equalTo("read", false)
|
}
|
||||||
.findAllSorted("date")
|
|
||||||
.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")
|
val notification = NotificationCompat.Builder(context, "channel_1")
|
||||||
.setColor(context.resources.getColor(R.color.colorPrimary))
|
.setColor(context.resources.getColor(R.color.colorPrimary))
|
||||||
|
|||||||
Reference in New Issue
Block a user