forked from upstream-mirrors/quik
Revamped data structure, use delegated properties for Conversation
This commit is contained in:
@@ -3,7 +3,6 @@ package com.moez.QKSMS.dagger
|
|||||||
import android.app.Application
|
import android.app.Application
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import com.moez.QKSMS.data.repository.ContactRepository
|
import com.moez.QKSMS.data.repository.ContactRepository
|
||||||
import com.moez.QKSMS.data.repository.ConversationRepository
|
|
||||||
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.DateFormatter
|
import com.moez.QKSMS.util.DateFormatter
|
||||||
@@ -35,14 +34,8 @@ class AppModule(var application: Application) {
|
|||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
@Singleton
|
@Singleton
|
||||||
fun provideNotificationHelper(context: Context, conversationRepository: ConversationRepository, messageRepository: MessageRepository): NotificationManager {
|
fun provideNotificationHelper(context: Context, messageRepository: MessageRepository): NotificationManager {
|
||||||
return NotificationManager(context, conversationRepository, messageRepository)
|
return NotificationManager(context, messageRepository)
|
||||||
}
|
|
||||||
|
|
||||||
@Provides
|
|
||||||
@Singleton
|
|
||||||
fun provideConversationRepository(): ConversationRepository {
|
|
||||||
return ConversationRepository()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Singleton
|
@Singleton
|
||||||
|
|||||||
@@ -1,45 +1,27 @@
|
|||||||
package com.moez.QKSMS.data.model
|
package com.moez.QKSMS.data.model
|
||||||
|
|
||||||
import android.database.Cursor
|
|
||||||
import com.moez.QKSMS.data.repository.ContactRepository
|
|
||||||
import com.moez.QKSMS.data.sync.ConversationColumns
|
|
||||||
import io.reactivex.Flowable
|
|
||||||
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 date: Long = 0
|
|
||||||
var messageCount: Int = 0
|
|
||||||
var contacts: RealmList<Contact> = RealmList()
|
var contacts: RealmList<Contact> = RealmList()
|
||||||
var snippet: String = ""
|
var messages: RealmList<Message> = RealmList()
|
||||||
var snippetCs: String = ""
|
|
||||||
var read: Boolean = true
|
|
||||||
var error: Int = 0
|
|
||||||
var hasAttachment: Int = 0
|
|
||||||
|
|
||||||
/**
|
@Ignore var date: Long = 0
|
||||||
* Instantiates a Conversation from the Android SMS ContentProvider
|
get() = lastMessage?.date ?: 0
|
||||||
*/
|
|
||||||
constructor(cursor: Cursor, contacts: ContactRepository) : this() {
|
|
||||||
id = cursor.getLong(ConversationColumns.ID)
|
|
||||||
date = cursor.getLong(ConversationColumns.DATE)
|
|
||||||
messageCount = cursor.getInt(ConversationColumns.MESSAGE_COUNT)
|
|
||||||
|
|
||||||
Flowable.fromIterable(cursor.getString(ConversationColumns.RECIPIENT_IDS).split(" "))
|
@Ignore var read: Boolean = true
|
||||||
.map { id -> id.toLong() }
|
get() = lastMessage?.read ?: true
|
||||||
.map { id -> contacts.getContactBlocking(id) }
|
|
||||||
.filter { contact -> contact.recipientId != 0L }
|
|
||||||
.blockingSubscribe { contact -> this.contacts.add(contact) }
|
|
||||||
|
|
||||||
snippet = cursor.getString(ConversationColumns.SNIPPET) ?: ""
|
@Ignore var snippet: String = ""
|
||||||
snippetCs = cursor.getString(ConversationColumns.SNIPPET_CS) ?: ""
|
get () = lastMessage?.body ?: ""
|
||||||
read = cursor.getInt(ConversationColumns.READ) != 0
|
|
||||||
error = cursor.getInt(ConversationColumns.ERROR)
|
@Ignore private var lastMessage: Message? = null
|
||||||
hasAttachment = cursor.getInt(ConversationColumns.HAS_ATTACHMENT)
|
get () = if (messages.size == 0) null else messages[0]
|
||||||
}
|
|
||||||
|
|
||||||
fun getTitle(): String {
|
fun getTitle(): String {
|
||||||
var title = ""
|
var title = ""
|
||||||
|
|||||||
@@ -1,14 +1,12 @@
|
|||||||
package com.moez.QKSMS.data.model
|
package com.moez.QKSMS.data.model
|
||||||
|
|
||||||
import android.database.Cursor
|
|
||||||
import android.provider.Telephony
|
import android.provider.Telephony
|
||||||
import android.provider.Telephony.Mms
|
import android.provider.Telephony.Mms
|
||||||
import android.provider.Telephony.Sms
|
import android.provider.Telephony.Sms
|
||||||
import com.moez.QKSMS.data.sync.MessageColumns
|
|
||||||
import io.realm.RealmObject
|
import io.realm.RealmObject
|
||||||
import io.realm.annotations.PrimaryKey
|
import io.realm.annotations.PrimaryKey
|
||||||
|
|
||||||
open class Message() : RealmObject() {
|
open class Message : RealmObject() {
|
||||||
|
|
||||||
@PrimaryKey var id: Long = 0
|
@PrimaryKey var id: Long = 0
|
||||||
var threadId: Long = 0
|
var threadId: Long = 0
|
||||||
@@ -21,31 +19,6 @@ open class Message() : RealmObject() {
|
|||||||
var read: Boolean = false
|
var read: Boolean = false
|
||||||
var errorType: Int = 0
|
var errorType: Int = 0
|
||||||
|
|
||||||
constructor(threadId: Long, cursor: Cursor, columnsMap: MessageColumns) : this() {
|
|
||||||
this.threadId = threadId
|
|
||||||
|
|
||||||
id = cursor.getLong(columnsMap.msgId)
|
|
||||||
type = cursor.getString(columnsMap.msgType)
|
|
||||||
|
|
||||||
val isMms = type == "mms"
|
|
||||||
body = cursor.getString(columnsMap.smsBody) ?: ""
|
|
||||||
errorType = cursor.getInt(columnsMap.mmsErrorType)
|
|
||||||
|
|
||||||
if (isMms) {
|
|
||||||
boxId = cursor.getInt(columnsMap.mmsMessageBox)
|
|
||||||
date = cursor.getLong(columnsMap.smsDate)
|
|
||||||
dateSent = cursor.getLong(columnsMap.smsDateSent)
|
|
||||||
seen = cursor.getInt(columnsMap.smsSeen) != 0
|
|
||||||
read = cursor.getInt(columnsMap.smsRead) != 0
|
|
||||||
} else {
|
|
||||||
boxId = cursor.getInt(columnsMap.smsType)
|
|
||||||
date = cursor.getLong(columnsMap.mmsDate)
|
|
||||||
dateSent = cursor.getLong(columnsMap.mmsDateSent)
|
|
||||||
seen = cursor.getInt(columnsMap.mmsSeen) != 0
|
|
||||||
read = cursor.getInt(columnsMap.mmsRead) != 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun isMms(): Boolean = type == "mms"
|
fun isMms(): Boolean = type == "mms"
|
||||||
|
|
||||||
fun isSms(): Boolean = type == "sms"
|
fun isSms(): Boolean = type == "sms"
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
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 getConversationAsync(threadId: Long): RealmResults<Conversation> {
|
|
||||||
return Realm.getDefaultInstance()
|
|
||||||
.where(Conversation::class.java)
|
|
||||||
.equalTo("id", threadId)
|
|
||||||
.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)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -6,24 +6,31 @@ import android.content.Context
|
|||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.Telephony
|
import android.provider.Telephony
|
||||||
import android.telephony.SmsManager
|
import android.telephony.SmsManager
|
||||||
|
import com.moez.QKSMS.data.model.Conversation
|
||||||
import com.moez.QKSMS.data.model.Message
|
import com.moez.QKSMS.data.model.Message
|
||||||
import com.moez.QKSMS.data.sync.MessageColumns
|
import com.moez.QKSMS.data.sync.MessageColumns
|
||||||
|
import com.moez.QKSMS.data.sync.SyncManager
|
||||||
import io.realm.Realm
|
import io.realm.Realm
|
||||||
import io.realm.RealmResults
|
import io.realm.RealmResults
|
||||||
|
|
||||||
class MessageRepository(val context: Context) {
|
class MessageRepository(val context: Context) {
|
||||||
|
|
||||||
fun getMessagesAsync(threadId: Long): RealmResults<Message> {
|
fun getConversationsAsync(): RealmResults<Conversation> {
|
||||||
return Realm.getDefaultInstance()
|
return Realm.getDefaultInstance()
|
||||||
.where(Message::class.java)
|
.where(Conversation::class.java)
|
||||||
.equalTo("threadId", threadId)
|
.findAllAsync()
|
||||||
.findAllSortedAsync("date")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getUnreadUnseenMessages(threadId: Long): RealmResults<Message> {
|
fun getConversationAsync(threadId: Long): Conversation {
|
||||||
|
return Realm.getDefaultInstance()
|
||||||
|
.where(Conversation::class.java)
|
||||||
|
.equalTo("id", threadId)
|
||||||
|
.findFirstAsync()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getUnreadUnseenMessages(): RealmResults<Message> {
|
||||||
return Realm.getDefaultInstance()
|
return Realm.getDefaultInstance()
|
||||||
.where(Message::class.java)
|
.where(Message::class.java)
|
||||||
.equalTo("threadId", threadId)
|
|
||||||
.equalTo("seen", false)
|
.equalTo("seen", false)
|
||||||
.equalTo("read", false)
|
.equalTo("read", false)
|
||||||
.findAllSorted("date")
|
.findAllSorted("date")
|
||||||
@@ -71,7 +78,7 @@ class MessageRepository(val context: Context) {
|
|||||||
|
|
||||||
if (messageCursor.moveToFirst()) {
|
if (messageCursor.moveToFirst()) {
|
||||||
val columns = MessageColumns(messageCursor)
|
val columns = MessageColumns(messageCursor)
|
||||||
val message = Message(threadId, messageCursor, columns)
|
val message = SyncManager.messageFromCursor(threadId, messageCursor, columns)
|
||||||
val realm = Realm.getDefaultInstance()
|
val realm = Realm.getDefaultInstance()
|
||||||
realm.executeTransaction { it.insertOrUpdate(message) }
|
realm.executeTransaction { it.insertOrUpdate(message) }
|
||||||
realm.close()
|
realm.close()
|
||||||
|
|||||||
@@ -7,22 +7,8 @@ internal object ConversationColumns {
|
|||||||
val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true")
|
val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true")
|
||||||
val PROJECTION = arrayOf(
|
val PROJECTION = arrayOf(
|
||||||
android.provider.Telephony.Threads._ID,
|
android.provider.Telephony.Threads._ID,
|
||||||
android.provider.Telephony.Threads.DATE,
|
android.provider.Telephony.Threads.RECIPIENT_IDS)
|
||||||
android.provider.Telephony.Threads.MESSAGE_COUNT,
|
|
||||||
android.provider.Telephony.Threads.RECIPIENT_IDS,
|
|
||||||
android.provider.Telephony.Threads.SNIPPET,
|
|
||||||
android.provider.Telephony.Threads.SNIPPET_CHARSET,
|
|
||||||
android.provider.Telephony.Threads.READ,
|
|
||||||
android.provider.Telephony.Threads.ERROR,
|
|
||||||
android.provider.Telephony.Threads.HAS_ATTACHMENT)
|
|
||||||
|
|
||||||
val ID = 0
|
val ID = 0
|
||||||
val DATE = 1
|
val RECIPIENT_IDS = 1
|
||||||
val MESSAGE_COUNT = 2
|
|
||||||
val RECIPIENT_IDS = 3
|
|
||||||
val SNIPPET = 4
|
|
||||||
val SNIPPET_CS = 5
|
|
||||||
val READ = 6
|
|
||||||
val ERROR = 7
|
|
||||||
val HAS_ATTACHMENT = 8
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.moez.QKSMS.data.sync
|
package com.moez.QKSMS.data.sync
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.database.Cursor
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import com.moez.QKSMS.data.model.Conversation
|
import com.moez.QKSMS.data.model.Conversation
|
||||||
import com.moez.QKSMS.data.model.Message
|
import com.moez.QKSMS.data.model.Message
|
||||||
@@ -11,8 +12,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
|
|||||||
import io.reactivex.schedulers.Schedulers
|
import io.reactivex.schedulers.Schedulers
|
||||||
import io.realm.Realm
|
import io.realm.Realm
|
||||||
|
|
||||||
class SyncManager(val context: Context, val contacts: ContactRepository) {
|
class SyncManager(val context: Context, private val contactsRepo: ContactRepository) {
|
||||||
private val TAG = "SyncManager"
|
|
||||||
|
|
||||||
fun copyToRealm(completionListener: () -> Unit) {
|
fun copyToRealm(completionListener: () -> Unit) {
|
||||||
|
|
||||||
@@ -30,19 +30,9 @@ class SyncManager(val context: Context, val contacts: ContactRepository) {
|
|||||||
realm?.deleteAll()
|
realm?.deleteAll()
|
||||||
}
|
}
|
||||||
.flatMap { cursor -> cursor.asFlowable() }
|
.flatMap { cursor -> cursor.asFlowable() }
|
||||||
.map { cursor -> Conversation(cursor, contacts) }
|
.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 }
|
|
||||||
.concatMap { 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 -> Message(threadId, 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 {
|
||||||
@@ -53,4 +43,56 @@ class SyncManager(val context: Context, val contacts: ContactRepository) {
|
|||||||
.subscribe { completionListener.invoke() }
|
.subscribe { completionListener.invoke() }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun conversationFromCursor(cursor: Cursor): Conversation {
|
||||||
|
return Conversation().apply {
|
||||||
|
id = cursor.getLong(ConversationColumns.ID)
|
||||||
|
|
||||||
|
cursor.getString(ConversationColumns.RECIPIENT_IDS).split(" ")
|
||||||
|
.map { id -> id.toLong() }
|
||||||
|
.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)
|
||||||
|
messagesCursor.asFlowable()
|
||||||
|
.map { cursor -> messageFromCursor(id, cursor, columnsMap) }
|
||||||
|
.filter { message -> message.type == "sms" || message.type == "mms" }
|
||||||
|
.distinct { message -> message.id }
|
||||||
|
.doOnNext { message -> messages.add(message) }
|
||||||
|
.blockingSubscribe()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO take this out of the companion object
|
||||||
|
companion object {
|
||||||
|
fun messageFromCursor(threadId: Long, cursor: Cursor, columnsMap: MessageColumns): Message {
|
||||||
|
return Message().apply {
|
||||||
|
this.threadId = threadId
|
||||||
|
|
||||||
|
id = cursor.getLong(columnsMap.msgId)
|
||||||
|
type = cursor.getString(columnsMap.msgType)
|
||||||
|
|
||||||
|
val isMms = type == "mms"
|
||||||
|
body = cursor.getString(columnsMap.smsBody) ?: ""
|
||||||
|
errorType = cursor.getInt(columnsMap.mmsErrorType)
|
||||||
|
|
||||||
|
if (isMms) {
|
||||||
|
boxId = cursor.getInt(columnsMap.mmsMessageBox)
|
||||||
|
date = cursor.getLong(columnsMap.smsDate)
|
||||||
|
dateSent = cursor.getLong(columnsMap.smsDateSent)
|
||||||
|
seen = cursor.getInt(columnsMap.smsSeen) != 0
|
||||||
|
read = cursor.getInt(columnsMap.smsRead) != 0
|
||||||
|
} else {
|
||||||
|
boxId = cursor.getInt(columnsMap.smsType)
|
||||||
|
date = cursor.getLong(columnsMap.mmsDate)
|
||||||
|
dateSent = cursor.getLong(columnsMap.mmsDateSent)
|
||||||
|
seen = cursor.getInt(columnsMap.mmsSeen) != 0
|
||||||
|
read = cursor.getInt(columnsMap.mmsRead) != 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ 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.Conversation
|
||||||
import com.moez.QKSMS.data.repository.ConversationRepository
|
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
|
||||||
import io.reactivex.subjects.PublishSubject
|
import io.reactivex.subjects.PublishSubject
|
||||||
@@ -15,7 +15,7 @@ class ConversationListViewModel : ViewModel() {
|
|||||||
|
|
||||||
@Inject lateinit var syncManager: SyncManager
|
@Inject lateinit var syncManager: SyncManager
|
||||||
@Inject lateinit var notificationManager: NotificationManager
|
@Inject lateinit var notificationManager: NotificationManager
|
||||||
@Inject lateinit var conversationRepo: ConversationRepository
|
@Inject lateinit var messageRepo: MessageRepository
|
||||||
|
|
||||||
val state: MutableLiveData<ConversationListViewState> = MutableLiveData()
|
val state: MutableLiveData<ConversationListViewState> = MutableLiveData()
|
||||||
|
|
||||||
@@ -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.getConversationsAsync()
|
conversations = messageRepo.getConversationsAsync()
|
||||||
partialStates.onNext(PartialState.ConversationsLoaded(conversations))
|
partialStates.onNext(PartialState.ConversationsLoaded(conversations))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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) messageList.adapter = MessageAdapter(this, state.messages)
|
if (messageList.adapter == null && state.messages?.isValid == true) messageList.adapter = MessageAdapter(this, 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()
|
||||||
|
|
||||||
|
|||||||
@@ -4,16 +4,12 @@ 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.Conversation
|
||||||
import com.moez.QKSMS.data.model.Message
|
|
||||||
import com.moez.QKSMS.data.repository.ConversationRepository
|
|
||||||
import com.moez.QKSMS.data.repository.MessageRepository
|
import com.moez.QKSMS.data.repository.MessageRepository
|
||||||
import io.reactivex.subjects.PublishSubject
|
import io.reactivex.subjects.PublishSubject
|
||||||
import io.realm.RealmResults
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class MessageListViewModel : ViewModel() {
|
class MessageListViewModel : ViewModel() {
|
||||||
|
|
||||||
@Inject lateinit var conversationRepo: ConversationRepository
|
|
||||||
@Inject lateinit var messageRepo: MessageRepository
|
@Inject lateinit var messageRepo: MessageRepository
|
||||||
|
|
||||||
val state: MutableLiveData<MessageListViewState> = MutableLiveData()
|
val state: MutableLiveData<MessageListViewState> = MutableLiveData()
|
||||||
@@ -24,8 +20,7 @@ class MessageListViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private val partialStates: PublishSubject<PartialState> = PublishSubject.create()
|
private val partialStates: PublishSubject<PartialState> = PublishSubject.create()
|
||||||
private var conversation: RealmResults<Conversation>? = null
|
private var conversation: Conversation? = null
|
||||||
private var messages: RealmResults<Message>? = null
|
|
||||||
|
|
||||||
init {
|
init {
|
||||||
AppComponentManager.appComponent.inject(this)
|
AppComponentManager.appComponent.inject(this)
|
||||||
@@ -36,21 +31,18 @@ class MessageListViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun newThreadId() {
|
private fun newThreadId() {
|
||||||
messages = messageRepo.getMessagesAsync(threadId)
|
|
||||||
messages?.let { partialStates.onNext(PartialState.MessagesLoaded(it)) }
|
|
||||||
|
|
||||||
conversation?.removeAllChangeListeners()
|
conversation?.removeAllChangeListeners()
|
||||||
conversation = conversationRepo.getConversationAsync(threadId)
|
conversation = messageRepo.getConversationAsync(threadId)
|
||||||
conversation?.addChangeListener { realmResults ->
|
conversation?.addChangeListener { conversation: Conversation ->
|
||||||
when (realmResults.size) {
|
when (conversation.isValid) {
|
||||||
0 -> partialStates.onNext(PartialState.ConversationError(true))
|
true -> partialStates.onNext(PartialState.ConversationLoaded(conversation))
|
||||||
else -> partialStates.onNext(PartialState.ConversationLoaded(realmResults[0]))
|
false -> partialStates.onNext(PartialState.ConversationError(true))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun sendMessage(body: String) {
|
fun sendMessage(body: String) {
|
||||||
conversation?.get(0)?.let { conversation ->
|
conversation?.takeIf { conversation -> conversation.isValid }?.let { conversation ->
|
||||||
messageRepo.sendMessage(threadId, conversation.contacts[0].address, body)
|
messageRepo.sendMessage(threadId, conversation.contacts[0].address, body)
|
||||||
partialStates.onNext(PartialState.TextChanged(""))
|
partialStates.onNext(PartialState.TextChanged(""))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ sealed class PartialState {
|
|||||||
|
|
||||||
data class ConversationLoaded(private val conversation: Conversation) : PartialState() {
|
data class ConversationLoaded(private val conversation: Conversation) : PartialState() {
|
||||||
override fun reduce(previousState: MessageListViewState): MessageListViewState {
|
override fun reduce(previousState: MessageListViewState): MessageListViewState {
|
||||||
return previousState.copy(title = conversation.getTitle())
|
return previousState.copy(title = conversation.getTitle(), messages = conversation.messages)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,12 +29,6 @@ sealed class PartialState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
data class MessagesLoaded(private val messages: OrderedRealmCollection<Message>) : PartialState() {
|
|
||||||
override fun reduce(previousState: MessageListViewState): MessageListViewState {
|
|
||||||
return previousState.copy(messages = messages)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data class TextChanged(private val text: String) : PartialState() {
|
data class TextChanged(private val text: String) : PartialState() {
|
||||||
override fun reduce(previousState: MessageListViewState): MessageListViewState {
|
override fun reduce(previousState: MessageListViewState): MessageListViewState {
|
||||||
return previousState.copy(draft = text)
|
return previousState.copy(draft = text)
|
||||||
|
|||||||
@@ -8,12 +8,10 @@ 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.repository.ConversationRepository
|
|
||||||
import com.moez.QKSMS.data.repository.MessageRepository
|
import com.moez.QKSMS.data.repository.MessageRepository
|
||||||
import io.realm.Realm
|
|
||||||
|
|
||||||
|
|
||||||
class NotificationManager(val context: Context, val conversationRepo: ConversationRepository, val messageRepo: MessageRepository) {
|
class NotificationManager(val context: Context, val messageRepo: MessageRepository) {
|
||||||
|
|
||||||
private val notificationManager = NotificationManagerCompat.from(context)
|
private val notificationManager = NotificationManagerCompat.from(context)
|
||||||
|
|
||||||
@@ -39,12 +37,11 @@ class NotificationManager(val context: Context, val conversationRepo: Conversati
|
|||||||
|
|
||||||
// https://developer.android.com/guide/topics/ui/notifiers/notifications.html
|
// https://developer.android.com/guide/topics/ui/notifiers/notifications.html
|
||||||
fun update() {
|
fun update() {
|
||||||
val realm = Realm.getDefaultInstance()
|
messageRepo.getUnreadUnseenMessages().groupBy { message -> message.threadId }.forEach { conversation ->
|
||||||
|
|
||||||
conversationRepo.getUnreadConversations().forEach { conversation ->
|
|
||||||
val style = NotificationCompat.MessagingStyle("Me")
|
val style = NotificationCompat.MessagingStyle("Me")
|
||||||
messageRepo.getUnreadUnseenMessages(conversation.id).forEach { message ->
|
conversation.value.forEach { message ->
|
||||||
val name = if (message.isMe()) null else conversation.getTitle()
|
val name = if (message.isMe()) null else "Person"
|
||||||
style.addMessage(message.body, message.date, name)
|
style.addMessage(message.body, message.date, name)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,10 +50,8 @@ class NotificationManager(val context: Context, val conversationRepo: Conversati
|
|||||||
.setSmallIcon(R.mipmap.ic_launcher)
|
.setSmallIcon(R.mipmap.ic_launcher)
|
||||||
.setStyle(style)
|
.setStyle(style)
|
||||||
|
|
||||||
notificationManager.notify(conversation.id.toInt(), notification.build())
|
notificationManager.notify(conversation.key.toInt(), notification.build())
|
||||||
}
|
}
|
||||||
|
|
||||||
realm.close()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user