diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt index 50093d61..552fcd0d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt @@ -85,7 +85,7 @@ class NotificationManager @Inject constructor( .setStyle(style) if (Build.VERSION.SDK_INT >= 24 && conversation != null) { - notification.addAction(getReplyAction(conversation.contacts[0]?.address.orEmpty(), conversation.id)) + notification.addAction(getReplyAction(conversation.recipients[0]?.address.orEmpty(), conversation.id)) } notificationManager.notify(threadId.toInt(), notification.build()) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversation.kt b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversation.kt index 203681ae..0968f0af 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversation.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversation.kt @@ -4,21 +4,18 @@ import android.database.Cursor import android.net.Uri import android.provider.Telephony.Threads import com.moez.QKSMS.data.model.Conversation -import com.moez.QKSMS.data.repository.ContactRepository -import io.reactivex.rxkotlin.toFlowable +import com.moez.QKSMS.data.model.Recipient import javax.inject.Inject -class CursorToConversation @Inject constructor(private val contactsRepo: ContactRepository) : Mapper { +class CursorToConversation @Inject constructor() : Mapper { override fun map(from: Cursor): Conversation { return Conversation().apply { id = from.getLong(ID) - - contacts.addAll(from.getString(RECIPIENT_IDS).split(" ").toFlowable() - .map { id -> id.toLong() } - .flatMap { id -> contactsRepo.getContact(id) } - .filter { contact -> contact.recipientId != 0L } - .blockingIterable()) + recipients.addAll(from.getString(RECIPIENT_IDS) + .split(" ") + .map { recipientId -> recipientId.toLong() } + .map { recipientId -> Recipient().apply { id = recipientId } }) } } 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 a6fc64a5..f7e3639a 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 @@ -7,14 +7,14 @@ import io.realm.annotations.PrimaryKey open class Conversation : RealmObject() { @PrimaryKey var id: Long = 0 - var contacts: RealmList = RealmList() + var recipients: RealmList = RealmList() var archived: Boolean = false fun getTitle(): String { var title = "" - contacts.forEachIndexed { index, recipient -> - title += if (recipient.name.isNotEmpty()) recipient.name else recipient.address - if (index < contacts.size - 1) { + recipients.forEachIndexed { index, recipient -> + title += recipient.address + if (index < recipients.size - 1) { title += ", " } } diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt new file mode 100644 index 00000000..3a2b5018 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt @@ -0,0 +1,11 @@ +package com.moez.QKSMS.data.model + +import io.realm.RealmObject +import io.realm.annotations.PrimaryKey + +open class Recipient : RealmObject() { + + @PrimaryKey var id: Long = 0 + var address: String = "" + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt index 017bfa9a..9ac1b0c1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt @@ -6,6 +6,7 @@ import android.provider.Telephony import com.moez.QKSMS.common.util.extensions.asFlowable import com.moez.QKSMS.data.mapper.CursorToConversation import com.moez.QKSMS.data.mapper.CursorToMessage +import com.moez.QKSMS.data.model.Recipient import com.moez.QKSMS.data.model.SyncLog import io.reactivex.Flowable import io.realm.Realm @@ -42,7 +43,6 @@ open class PartialSync @Inject constructor( } .map { contentResolver.query(CursorToConversation.URI, CursorToConversation.PROJECTION, "date >= ?", arrayOf(lastSync.toString()), "date desc") } .flatMap { cursor -> cursor.asFlowable().map { cursorToConversation.map(it) } } - .distinct { conversation -> conversation.id } .doOnNext { conversation -> realm?.insertOrUpdate(conversation) } .map { conversation -> conversation.id } .map { threadId -> Uri.withAppendedPath(Telephony.MmsSms.CONTENT_CONVERSATIONS_URI, threadId.toString()) } @@ -54,10 +54,20 @@ open class PartialSync @Inject constructor( .takeWhile { message -> message.date >= lastSync } } .filter { message -> message.type == "sms" || message.type == "mms" } - .distinct { message -> message.id } .doOnNext { message -> realm?.insertOrUpdate(message) } .count() .toFlowable() + .map { contentResolver.query(Uri.parse("content://mms-sms/canonical-addresses"), null, null, null, null) } + .flatMap { cursor -> cursor.asFlowable() } + .map { cursor -> + Recipient().apply { + id = cursor.getLong(0) + address = cursor.getString(1) + } + } + .doOnNext { recipient -> realm?.insertOrUpdate(recipient)} + .count() + .toFlowable() .doOnNext { realm?.commitTransaction() realm?.close() diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/GroupAvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/GroupAvatarView.kt index 42f9dc1a..a86d79dc 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/GroupAvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/GroupAvatarView.kt @@ -6,12 +6,11 @@ import android.util.AttributeSet import android.view.View import com.moez.QKSMS.R import com.moez.QKSMS.data.model.Contact -import io.realm.RealmList import kotlinx.android.synthetic.main.group_avatar_view.view.* class GroupAvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(context, attrs) { - var contacts: RealmList = RealmList() + var contacts: List = ArrayList() set(value) { field = value updateView() diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt index fe9c0641..192038b6 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt @@ -141,8 +141,8 @@ class ComposeViewModel(threadId: Long) : QkViewModel( // Open the phone dialer if the call button is clicked intents += view.callIntent .withLatestFrom(conversation, { _, conversation -> conversation }) - .map { conversation -> conversation.contacts.first() } - .map { contact -> contact.address } + .map { conversation -> conversation.recipients.first() } + .map { recipient -> recipient.address } .subscribe { address -> navigator.makePhoneCall(address) } // Toggle the archived state of the conversation @@ -171,7 +171,7 @@ class ComposeViewModel(threadId: Long) : QkViewModel( .map { body -> body.toString() } .withLatestFrom(conversation, { body, conversation -> val threadId = conversation.id - val address = conversation.contacts.first()?.address.orEmpty() + val address = conversation.recipients.first()?.address.orEmpty() sendMessage.execute(SendMessage.Params(threadId, address, body)) newState { it.copy(editingMode = false, draft = "", canSend = false) } }) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt index 6027e315..63ae6706 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt @@ -8,6 +8,7 @@ import com.jakewharton.rxbinding2.view.RxView import com.moez.QKSMS.R import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.DateFormatter +import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.ConversationMessagePair import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.presentation.Navigator @@ -62,7 +63,7 @@ class ConversationsAdapter @Inject constructor( RxView.clicks(view).subscribe { navigator.showConversation(message.threadId) } RxView.longClicks(view).subscribe { longClicks.onNext(conversation.id) } - view.avatars.contacts = conversation.contacts + view.avatars.contacts = conversation.recipients.map { recipient -> Contact().apply { address = recipient.address } } view.title.text = conversation.getTitle() view.date.text = dateFormatter.getConversationTimestamp(message.date) view.snippet.text = message.body